diff options
| author | Russell King <rmk@arm.linux.org.uk> | 2006-01-05 14:40:58 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-13 11:26:08 -0800 |
| commit | 1d0baa3a1c836f0403b318d549fd49ebc73ee631 (patch) | |
| tree | 22a59c7e5840c035f79703419bdb25fde180ce2a /drivers/pcmcia | |
| parent | 4d0b653cdfde193944784c01fa3359b0a444dcf1 (diff) | |
| download | linux-3.10-1d0baa3a1c836f0403b318d549fd49ebc73ee631.tar.gz linux-3.10-1d0baa3a1c836f0403b318d549fd49ebc73ee631.tar.bz2 linux-3.10-1d0baa3a1c836f0403b318d549fd49ebc73ee631.zip | |
[PATCH] Add pcmcia_bus_type probe and remove methods
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/ds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 621ec459d27..0a424a4e818 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c @@ -311,8 +311,6 @@ int pcmcia_register_driver(struct pcmcia_driver *driver) /* initialize common fields */ driver->drv.bus = &pcmcia_bus_type; driver->drv.owner = driver->owner; - driver->drv.probe = pcmcia_device_probe; - driver->drv.remove = pcmcia_device_remove; return driver_register(&driver->drv); } @@ -1200,6 +1198,8 @@ struct bus_type pcmcia_bus_type = { .uevent = pcmcia_bus_uevent, .match = pcmcia_bus_match, .dev_attrs = pcmcia_dev_attrs, + .probe = pcmcia_device_probe, + .remove = pcmcia_device_remove, .suspend = pcmcia_dev_suspend, .resume = pcmcia_dev_resume, }; |