commit 1bc857f700fb14bbcb990a81b1255f39807ae59e
author Russell King <rmk+kernel@arm.linux.org.uk> Tue Jul 26 10:54:55 2011 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon Aug 08 14:27:44 2011 +0100
tree a587ef3eda0ea6d6a682b4bd5a8f6a6bcb814739
parent 2f8163baada3dbd0ce891c35bc59ae46e773487a

ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

drivers/mtd/nand/ams-delta.c

diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 78017eb..9e6b498 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -26,7 +26,7 @@
 #include <asm/io.h>
 #include <mach/hardware.h>
 #include <asm/sizes.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 #include <plat/board-ams-delta.h>
 
 /*

drivers/mtd/onenand/omap2.c

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index a916dec..6a1d6d9 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -40,7 +40,7 @@
 #include <asm/mach/flash.h>
 #include <plat/gpmc.h>
 #include <plat/onenand.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 
 #include <plat/dma.h>