From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 5 Nov 2011 22:06:17 +0000 (+0000)
Subject: ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
X-Git-Tag: firefly_0821_release~3680^2~4179^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7a3f8de5a3c36e5fde130cae74a06663b59837ae;p=firefly-linux-kernel-4.4.55.git

ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver

The includes in the pxa2xx_cm_x2xx PCMCIA driver are rather random;
the driver doesn't require anything from these headers except the
cpu_is_xxx() macros which come from another include.

The concern is that it's getting these definitions via mach/system.h,
which is supposed to only be included by arch/arm/kernel/process.c.
As this header is scheduled for cleanup (and elimination) keeping
the status quo will cause build errors.  So lets fix properly and
independent of the future work.

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

diff --git a/drivers/pcmcia/pxa2xx_cm_x2xx.c b/drivers/pcmcia/pxa2xx_cm_x2xx.c
index 4f09506ad8d4..6e7dcfd22ede 100644
--- a/drivers/pcmcia/pxa2xx_cm_x2xx.c
+++ b/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);