[PATCH] Add pcmcia_bus_type probe and remove methods

From: Greg KH
Date: Fri Jan 13 2006 - 14:59:09 EST


[PATCH] Add pcmcia_bus_type probe and remove methods

Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

---
commit 1d0baa3a1c836f0403b318d549fd49ebc73ee631
tree 22a59c7e5840c035f79703419bdb25fde180ce2a
parent 4d0b653cdfde193944784c01fa3359b0a444dcf1
author Russell King <rmk@xxxxxxxxxxxxxxxx> Thu, 05 Jan 2006 14:40:58 +0000
committer Greg Kroah-Hartman <gregkh@xxxxxxx> Fri, 13 Jan 2006 11:26:08 -0800

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 621ec45..0a424a4 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -311,8 +311,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);
}
@@ -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,
};

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/