Messages in this thread Patch in this message | | | Subject | [CFT 22/29] Add pcmcia_bus_type probe and remove methods | Date | Thu, 05 Jan 2006 14:40:58 +0000 | From | Russell King <> |
| |
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
--- drivers/pcmcia/ds.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej -x .git linus/drivers/pcmcia/ds.c linux/drivers/pcmcia/ds.c --- linus/drivers/pcmcia/ds.c Sun Nov 6 22:17:11 2005 +++ linux/drivers/pcmcia/ds.c Sun Nov 13 16:33:41 2005 @@ -315,8 +315,6 @@ int pcmcia_register_driver(struct pcmcia /* 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); } @@ -1226,6 +1224,8 @@ struct bus_type pcmcia_bus_type = { .hotplug = pcmcia_bus_hotplug, .match = pcmcia_bus_match, .dev_attrs = pcmcia_dev_attrs, + .probe = pcmcia_device_probe, + .remove = pcmcia_device_remove, }; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |