Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6

[karo-tx-linux.git] / drivers / spi / spi-atmel.c

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index a356392ab2f6bd9d537c4459c83d66ed2794447d..79665e2e6ec524b89f02c6aa680ca5b133009fa9 100644 (file)
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -22,7 +22,7 @@
 
 #include <asm/io.h>
 #include <mach/board.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 #include <mach/cpu.h>
 
 /* SPI register offsets */