Commit db45705c authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'topic/asoc' into for-linus

parents 1de9e8e7 591046cf
...@@ -44,8 +44,6 @@ ...@@ -44,8 +44,6 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <mach/hardware.h>
#include "atmel-pcm.h" #include "atmel-pcm.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment