diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 22:06:17 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 22:26:46 (GMT) |
| commit | 7a3f8de5a3c36e5fde130cae74a06663b59837ae (patch) | |
| tree | 71cbf9c7ac4b1f7ad53bd033a188b16d82543feb /drivers/pcmcia | |
| parent | 7124cb96cadc5f9990ade39780b672b01bfc6484 (diff) | |
| download | linux-7a3f8de5a3c36e5fde130cae74a06663b59837ae.tar.xz | |
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>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_cm_x2xx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/pxa2xx_cm_x2xx.c b/drivers/pcmcia/pxa2xx_cm_x2xx.c index 4f09506..6e7dcfd 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); |