From rmk+greg=kroah.com@arm.linux.org.uk Thu Jan 5 06:43:18 2006 From: Russell King CC: Greg K-H , Adam Belay Subject: [CFT 23/29] Add pnp_bus_type probe and remove methods Date: Thu, 05 Jan 2006 14:41:37 +0000 Message-ID: <20060105142951.13.23@flint.arm.linux.org.uk> Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman --- drivers/pnp/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- gregkh-2.6.orig/drivers/pnp/driver.c +++ gregkh-2.6/drivers/pnp/driver.c @@ -195,6 +195,8 @@ static int pnp_bus_resume(struct device 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_drive 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);