Merge branches 'pxa-core' and 'pxa-machines' into pxa-all

[linux-2.6-omap-h63xx.git] / arch / arm / mach-s3c2412 / gpio.c

diff --git a/arch/arm/mach-s3c2412/gpio.c b/arch/arm/mach-s3c2412/gpio.c
index 4f86693b05fd72f1d173c9d4e7aff9e40c583f8f..f7afece7fc38b1f304566ee0e0083b7055a999dd 100644 (file)
--- a/arch/arm/mach-s3c2412/gpio.c
+++ b/arch/arm/mach-s3c2412/gpio.c
@@ -20,9 +20,9 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state)
 {