From 2bf356c4f787de466e0b39669fd0605b60ab83cf Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 5 Jan 2006 14:44:14 +0000 Subject: [PATCH] --- yaml --- r: 18397 b: refs/heads/master c: fc3d3ddd3e628d9f22d4aa56a640d0b31c977a8f h: refs/heads/master i: 18395: 51c2b600decfc58b4b3b213901b807ac6f45d1fb v: v3 --- [refs] | 2 +- trunk/drivers/rapidio/rio-driver.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a457627ddd82..b18fa0e7121d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6a01e9bda69aaf22f3a23bafc91c0fb51420a7a +refs/heads/master: fc3d3ddd3e628d9f22d4aa56a640d0b31c977a8f diff --git a/trunk/drivers/rapidio/rio-driver.c b/trunk/drivers/rapidio/rio-driver.c index dc749609699a..5480119ff9d3 100644 --- a/trunk/drivers/rapidio/rio-driver.c +++ b/trunk/drivers/rapidio/rio-driver.c @@ -147,8 +147,6 @@ int rio_register_driver(struct rio_driver *rdrv) /* initialize common driver fields */ rdrv->driver.name = rdrv->name; rdrv->driver.bus = &rio_bus_type; - rdrv->driver.probe = rio_device_probe; - rdrv->driver.remove = rio_device_remove; /* register with core */ return driver_register(&rdrv->driver); @@ -204,7 +202,9 @@ static struct device rio_bus = { struct bus_type rio_bus_type = { .name = "rapidio", .match = rio_match_bus, - .dev_attrs = rio_dev_attrs + .dev_attrs = rio_dev_attrs, + .probe = rio_device_probe, + .remove = rio_device_remove, }; /**