Merge branch 'message-callback' into kbuild/kconfig

[karo-tx-linux.git] / arch / arm / mach-s5pv210 / setup-i2c1.c

diff --git a/arch/arm/mach-s5pv210/setup-i2c1.c b/arch/arm/mach-s5pv210/setup-i2c1.c
index 45e0e6ed2ed07c6991511a60efa1db16884be971..148bb7857d896279def1965103a1d26c2390c9dd 100644 (file)
--- a/arch/arm/mach-s5pv210/setup-i2c1.c
+++ b/arch/arm/mach-s5pv210/setup-i2c1.c
@@ -14,10 +14,10 @@
 
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <linux/gpio.h>
 
 struct platform_device; /* don't need the contents */
 
-#include <mach/gpio.h>
 #include <plat/iic.h>
 #include <plat/gpio-cfg.h>