From 6c5191d7b06dd7e35c3f1aa6c2a327f86c9fa009 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 5 Jan 2006 14:41:37 +0000 Subject: [PATCH] --- yaml --- r: 18392 b: refs/heads/master c: 4681fc320889de4591f945c4fdf08546eb9ab266 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pnp/driver.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f4decaa2ba36..9685bae9416e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d0baa3a1c836f0403b318d549fd49ebc73ee631 +refs/heads/master: 4681fc320889de4591f945c4fdf08546eb9ab266 diff --git a/trunk/drivers/pnp/driver.c b/trunk/drivers/pnp/driver.c index 15fb758a9e52..7cafacdd12b0 100644 --- a/trunk/drivers/pnp/driver.c +++ b/trunk/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);