Merge branch 'for-2.6.29' into for-2.6.30

This commit is contained in:
Mark Brown 2009-01-16 16:40:35 +00:00
commit 2905a5df4a

View File

@ -44,8 +44,6 @@
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <mach/hardware.h>
#include "atmel-pcm.h"