From d54baf4d581261310fe80d31dd80039ffa8a1d2f Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 26 Jul 2011 10:57:37 +0100
Subject: [PATCH] --- yaml --- r: 269389 b: refs/heads/master c:
 75482dc3ded2be0b04ee00294f8db94a38748096 h: refs/heads/master i:   269387:
 175b97153fb5ebaf5303b04bdea0047d404f720e v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/gpio/gpio-nomadik.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 620fb05e33f8..860b51edfe75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60e8972dc7e1df843d7132fb572e74f10502a4b7
+refs/heads/master: 75482dc3ded2be0b04ee00294f8db94a38748096
diff --git a/trunk/drivers/gpio/gpio-nomadik.c b/trunk/drivers/gpio/gpio-nomadik.c
index 2c212c732d76..f7f0406ed880 100644
--- a/trunk/drivers/gpio/gpio-nomadik.c
+++ b/trunk/drivers/gpio/gpio-nomadik.c
@@ -28,7 +28,7 @@
 
 #include <plat/pincfg.h>
 #include <mach/hardware.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 
 /*
  * The GPIO module in the Nomadik family of Systems-on-Chip is an