Merge branch 'for-2.6.37/barrier' of git://git.kernel.dk/linux-2.6-block

[mv-sheeva.git] / arch / arm / mach-s5pc100 / dev-spi.c

diff --git a/arch/arm/mach-s5pc100/dev-spi.c b/arch/arm/mach-s5pc100/dev-spi.c
index 14618c3460574123e98298f1f84582bc701ceef3..a0ef7c302c16e62deee6db35274163d73fe54e80 100644 (file)
--- a/arch/arm/mach-s5pc100/dev-spi.c
+++ b/arch/arm/mach-s5pc100/dev-spi.c
@@ -10,10 +10,10 @@
 
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/gpio.h>
 
 #include <mach/dma.h>
 #include <mach/map.h>
-#include <mach/gpio.h>
 #include <mach/spi-clocks.h>
 
 #include <plat/s3c64xx-spi.h>