From 4cedee60a192b0340794d949aec57fdf0e7800b5 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 26 Jul 2011 11:01:15 +0100
Subject: [PATCH] --- yaml --- r: 269394 b: refs/heads/master c:
 50ac01fbd29ba208d0cd4cb9467d3ffc07ae834a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fc0921f82e84..a698acaa7f2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6b750d4ba2fda038ba8e37eda59ec49d31ae88b
+refs/heads/master: 50ac01fbd29ba208d0cd4cb9467d3ffc07ae834a
diff --git a/trunk/drivers/pcmcia/pxa2xx_vpac270.c b/trunk/drivers/pcmcia/pxa2xx_vpac270.c
index e956f659089a..66ab92cf3105 100644
--- a/trunk/drivers/pcmcia/pxa2xx_vpac270.c
+++ b/trunk/drivers/pcmcia/pxa2xx_vpac270.c
@@ -17,7 +17,7 @@
 
 #include <asm/mach-types.h>
 
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 #include <mach/vpac270.h>
 
 #include "soc_common.h"