diff options
| author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2009-03-29 19:42:44 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2009-11-09 08:30:11 +0100 |
| commit | 701a5dc05ad99a06958b3f97cb69d99b47cebee3 (patch) | |
| tree | f91ab0cb2179fa771dfb3c9929bc09c7580ec3f8 /drivers/pcmcia/sa1100_badge4.c | |
| parent | da4f007375197d6683461b995d404b01a7fdf2f5 (diff) | |
| download | kernel_samsung_crespo-701a5dc05ad99a06958b3f97cb69d99b47cebee3.zip kernel_samsung_crespo-701a5dc05ad99a06958b3f97cb69d99b47cebee3.tar.gz kernel_samsung_crespo-701a5dc05ad99a06958b3f97cb69d99b47cebee3.tar.bz2 | |
PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/sa1100_badge4.c')
| -rw-r--r-- | drivers/pcmcia/sa1100_badge4.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1100_badge4.c b/drivers/pcmcia/sa1100_badge4.c index 1ca9737..6399314 100644 --- a/drivers/pcmcia/sa1100_badge4.c +++ b/drivers/pcmcia/sa1100_badge4.c @@ -134,6 +134,9 @@ static struct pcmcia_low_level badge4_pcmcia_ops = { .socket_init = sa1111_pcmcia_socket_init, .socket_suspend = sa1111_pcmcia_socket_suspend, + + .first = 0, + .nr = 2, }; int pcmcia_badge4_init(struct device *dev) @@ -146,7 +149,9 @@ int pcmcia_badge4_init(struct device *dev) __func__, badge4_pcmvcc, badge4_pcmvpp, badge4_cfvcc); - ret = sa11xx_drv_pcmcia_probe(dev, &badge4_pcmcia_ops, 0, 2); + sa11xx_drv_pcmcia_ops(&badge4_pcmcia_ops); + ret = sa1111_pcmcia_add(dev, &badge4_pcmcia_ops, + sa11xx_drv_pcmcia_add_one); } return ret; |