diff options
author | Russell King <rmk@arm.linux.org.uk> | 2006-01-05 09:40:58 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-13 14:26:08 -0500 |
commit | 1d0baa3a1c836f0403b318d549fd49ebc73ee631 (patch) | |
tree | 22a59c7e5840c035f79703419bdb25fde180ce2a /drivers/pcmcia/ds.c | |
parent | 4d0b653cdfde193944784c01fa3359b0a444dcf1 (diff) |
[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/ds.c')
-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 621ec459d27a..0a424a4e8187 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
@@ -311,8 +311,6 @@ int pcmcia_register_driver(struct pcmcia_driver *driver) | |||
311 | /* initialize common fields */ | 311 | /* initialize common fields */ |
312 | driver->drv.bus = &pcmcia_bus_type; | 312 | driver->drv.bus = &pcmcia_bus_type; |
313 | driver->drv.owner = driver->owner; | 313 | driver->drv.owner = driver->owner; |
314 | driver->drv.probe = pcmcia_device_probe; | ||
315 | driver->drv.remove = pcmcia_device_remove; | ||
316 | 314 | ||
317 | return driver_register(&driver->drv); | 315 | return driver_register(&driver->drv); |
318 | } | 316 | } |
@@ -1200,6 +1198,8 @@ struct bus_type pcmcia_bus_type = { | |||
1200 | .uevent = pcmcia_bus_uevent, | 1198 | .uevent = pcmcia_bus_uevent, |
1201 | .match = pcmcia_bus_match, | 1199 | .match = pcmcia_bus_match, |
1202 | .dev_attrs = pcmcia_dev_attrs, | 1200 | .dev_attrs = pcmcia_dev_attrs, |
1201 | .probe = pcmcia_device_probe, | ||
1202 | .remove = pcmcia_device_remove, | ||
1203 | .suspend = pcmcia_dev_suspend, | 1203 | .suspend = pcmcia_dev_suspend, |
1204 | .resume = pcmcia_dev_resume, | 1204 | .resume = pcmcia_dev_resume, |
1205 | }; | 1205 | }; |