Skip to content

L
linux-davinci
Commit 2905a5df authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge branch 'for-2.6.29' into for-2.6.30

parents 0465c7aa 591046cf
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
sound/soc/atmel/atmel-pcm.c
View file @ 2905a5df
...@@ -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