From 111dc88a86007dc38f788a28735e0241b4c16854 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 5 Nov 2011 22:06:17 +0000
Subject: [PATCH] --- yaml --- r: 274133 b: refs/heads/master c:
 7a3f8de5a3c36e5fde130cae74a06663b59837ae h: refs/heads/master i:   274131:
 c6808990170a944a161147032106a1db6d4df883 v: v3

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

diff --git a/[refs] b/[refs]
index e834de75e1bf..0d5da299ad85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7124cb96cadc5f9990ade39780b672b01bfc6484
+refs/heads/master: 7a3f8de5a3c36e5fde130cae74a06663b59837ae
diff --git a/trunk/drivers/pcmcia/pxa2xx_cm_x2xx.c b/trunk/drivers/pcmcia/pxa2xx_cm_x2xx.c
index 4f09506ad8d4..6e7dcfd22ede 100644
--- a/trunk/drivers/pcmcia/pxa2xx_cm_x2xx.c
+++ b/trunk/drivers/pcmcia/pxa2xx_cm_x2xx.c
@@ -12,9 +12,8 @@
 
 #include <linux/module.h>
 
-#include <asm/system.h>
 #include <asm/mach-types.h>
-#include <mach/system.h>
+#include <mach/hardware.h>
 
 int cmx255_pcmcia_init(void);
 int cmx270_pcmcia_init(void);