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

Merge branch 'for-2.6.29' into for-2.6.30

parents 0465c7aa 591046cf
......@@ -44,8 +44,6 @@
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <mach/hardware.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