diff options
| author | Eric Miao | 2009-01-19 10:34:27 +0100 |
|---|---|---|
| committer | Eric Miao | 2009-03-09 14:22:39 +0100 |
| commit | b393c69652333be31ad7a8205761c0d5b7f3e167 (patch) | |
| tree | 92fb162efe41532bc9867f3f7cf2c269b5ce0129 /drivers/pcmcia/soc_common.h | |
| parent | [ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h (diff) | |
| download | kernel-qcow2-linux-b393c69652333be31ad7a8205761c0d5b7f3e167.tar.gz kernel-qcow2-linux-b393c69652333be31ad7a8205761c0d5b7f3e167.tar.xz kernel-qcow2-linux-b393c69652333be31ad7a8205761c0d5b7f3e167.zip | |
[ARM] pxa: move PCMCIA definitions out of pxa-regs.h into pxa2xx_base.c
Move the processor specific initialization (largely resources initialization)
out of soc_common_drv_pcmcia_probe() into dedicated sa11xx_drv_pcmcia_probe()
and __pxa2xx_drv_pcmcia_probe().
By doing this, we are now able to move the PCMCIA related definitions out of
pxa-regs.h and back into pxa2xx_base.c.
As a result, remove that reference of _PCMCIA1IO in arch/arm/mach-pxa/viper.c.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'drivers/pcmcia/soc_common.h')
| -rw-r--r-- | drivers/pcmcia/soc_common.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h index 38c67375f363..290e143839ee 100644 --- a/drivers/pcmcia/soc_common.h +++ b/drivers/pcmcia/soc_common.h @@ -58,6 +58,11 @@ struct soc_pcmcia_socket { struct list_head node; }; +struct skt_dev_info { + int nskt; + struct soc_pcmcia_socket skt[0]; +}; + struct pcmcia_state { unsigned detect: 1, ready: 1, @@ -132,7 +137,7 @@ extern void soc_common_pcmcia_get_timing(struct soc_pcmcia_socket *, struct soc_ extern struct list_head soc_pcmcia_sockets; -extern int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr); +extern int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, struct skt_dev_info *sinfo); extern int soc_common_drv_pcmcia_remove(struct device *dev); |