ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 5 Nov 2011 22:06:17 +0000 (22:06 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 5 Nov 2011 22:26:46 +0000 (22:26 +0000)
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>
drivers/pcmcia/pxa2xx_cm_x2xx.c

index 4f09506ad8d49398d03918227303dda202b674fe..6e7dcfd22ede8c5696cb68b80528bb94ddf9b2f1 100644 (file)
@@ -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);