Commit 2905a5df authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.29' into for-2.6.30

parents 0465c7aa 591046cf

sound/soc/atmel/atmel-pcm.c

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ 
#include <sound/pcm_params.h>

#include <sound/soc.h>



#include <mach/hardware.h>



#include "atmel-pcm.h"