Merge branch 'for-3.1' into for-3.2

git-mirror · Aug 14, 2011 · b21a415 · b21a415
2 parents 4835ff9 + b848792
commit b21a415
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c
@@ -13,6 +13,7 @@
  *
  */
 
+#include <linux/types.h>
 #include <linux/gpio.h>
 
 #include <sound/soc.h>

diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c
@@ -17,6 +17,7 @@
  *
  */
 
+#include <linux/types.h>
 #include <linux/gpio.h>
 
 #include <sound/soc.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
      *
      */
+    #include <linux/types.h>
     #include <linux/gpio.h>
     #include <sound/soc.h>
@@ Expand Down @@