7a3f8de5a3
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>
48 lines
1.1 KiB
C
48 lines
1.1 KiB
C
/*
|
|
* linux/drivers/pcmcia/pxa/pxa_cm_x2xx.c
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* Compulab Ltd., 2003, 2007, 2008
|
|
* Mike Rapoport <mike@compulab.co.il>
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <mach/hardware.h>
|
|
|
|
int cmx255_pcmcia_init(void);
|
|
int cmx270_pcmcia_init(void);
|
|
void cmx255_pcmcia_exit(void);
|
|
void cmx270_pcmcia_exit(void);
|
|
|
|
static int __init cmx2xx_pcmcia_init(void)
|
|
{
|
|
int ret = -ENODEV;
|
|
|
|
if (machine_is_armcore() && cpu_is_pxa25x())
|
|
ret = cmx255_pcmcia_init();
|
|
else if (machine_is_armcore() && cpu_is_pxa27x())
|
|
ret = cmx270_pcmcia_init();
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void __exit cmx2xx_pcmcia_exit(void)
|
|
{
|
|
if (machine_is_armcore() && cpu_is_pxa25x())
|
|
cmx255_pcmcia_exit();
|
|
else if (machine_is_armcore() && cpu_is_pxa27x())
|
|
cmx270_pcmcia_exit();
|
|
}
|
|
|
|
module_init(cmx2xx_pcmcia_init);
|
|
module_exit(cmx2xx_pcmcia_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
|
|
MODULE_DESCRIPTION("CM-x2xx PCMCIA driver");
|