Merge branch 'for-3.2' into for-3.3

2011-12-06 11:01:38 +00:00
parent 6664ee115b f8f626f537
commit 21abbb024f
2 changed files with 2 additions and 1 deletions
--- a/sound/soc/codecs/jz4740.c
+++ b/sound/soc/codecs/jz4740.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/io.h>

 #include <linux/delay.h>