Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db45705c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/asoc' into for-linus

parents 1de9e8e7 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"