aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk@arm.linux.org.uk>2006-01-05 14:41:37 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-13 11:26:09 -0800
commit4681fc320889de4591f945c4fdf08546eb9ab266 (patch)
tree84da79632be2925c68eed99636c184f8342d270e /drivers
parent1d0baa3a1c836f0403b318d549fd49ebc73ee631 (diff)
[PATCH] Add pnp_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')
-rw-r--r--drivers/pnp/driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 15fb758a9e5..7cafacdd12b 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -195,6 +195,8 @@ static int pnp_bus_resume(struct device *dev)
struct bus_type pnp_bus_type = {
.name = "pnp",
.match = pnp_bus_match,
+ .probe = pnp_device_probe,
+ .remove = pnp_device_remove,
.suspend = pnp_bus_suspend,
.resume = pnp_bus_resume,
};
@@ -215,8 +217,6 @@ int pnp_register_driver(struct pnp_driver *drv)
drv->driver.name = drv->name;
drv->driver.bus = &pnp_bus_type;
- drv->driver.probe = pnp_device_probe;
- drv->driver.remove = pnp_device_remove;
count = driver_register(&drv->driver);