Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next

2013-11-12 10:59:08 +00:00
parent df762eccba 6ecf830e50 1ff44433c6 f3964fe1c9
commit 42cbe8271c
16 changed files with 98 additions and 106 deletions
--- a/drivers/gpio/gpio-sa1100.c
+++ b/drivers/gpio/gpio-sa1100.c
@@ -10,7 +10,7 @@
 #include <linux/gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
-
+#include <linux/io.h>
 #include <mach/hardware.h>
 #include <mach/irqs.h>