Merge branch 'depends/rmk/gpio' into next/fixes

[linux-beck.git] / arch / arm / mach-pxa / saarb.c

diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c
index aebd5d9243c3956c51a1aeac8744ef7122ec1d2e..46682176666130a284f5bb75efe42dafb5bea460 100644 (file)
--- a/arch/arm/mach-pxa/saarb.c
+++ b/arch/arm/mach-pxa/saarb.c
@@ -9,19 +9,21 @@
  *  it under the terms of the GNU General Public License version 2 as
  *  publishhed by the Free Software Foundation.
  */
-
+#include <linux/gpio.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pxa-i2c.h>
 #include <linux/mfd/88pm860x.h>
+#include <linux/gpio.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
 #include <mach/irqs.h>
 #include <mach/hardware.h>
-#include <mach/gpio.h>
+#include <mach/mfp.h>
+#include <mach/mfp-pxa930.h>
 #include <mach/pxa95x.h>
 
 #include "generic.h"