diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 16:26:28 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 16:26:28 +0100 |
commit | 0825788ff27c7145e9d558cb2a26f3837d1f9be5 (patch) | |
tree | f6bdb892cec8ca0df69c08a3477c89f1542999e5 /drivers/sh/superhyway/superhyway.c | |
parent | Merge branch 'upstream' (diff) | |
parent | [PATCH] libata: add a function to decide if we need iordy (diff) | |
download | linux-0825788ff27c7145e9d558cb2a26f3837d1f9be5.tar.xz linux-0825788ff27c7145e9d558cb2a26f3837d1f9be5.zip |
Merge branch 'upstream'
Diffstat (limited to 'drivers/sh/superhyway/superhyway.c')
-rw-r--r-- | drivers/sh/superhyway/superhyway.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sh/superhyway/superhyway.c b/drivers/sh/superhyway/superhyway.c index 7bdab2a7f59c..94b229031198 100644 --- a/drivers/sh/superhyway/superhyway.c +++ b/drivers/sh/superhyway/superhyway.c @@ -175,8 +175,6 @@ int superhyway_register_driver(struct superhyway_driver *drv) { drv->drv.name = drv->name; drv->drv.bus = &superhyway_bus_type; - drv->drv.probe = superhyway_device_probe; - drv->drv.remove = superhyway_device_remove; return driver_register(&drv->drv); } @@ -213,6 +211,8 @@ struct bus_type superhyway_bus_type = { #ifdef CONFIG_SYSFS .dev_attrs = superhyway_dev_attrs, #endif + .probe = superhyway_device_probe, + .remove = superhyway_device_remove, }; static int __init superhyway_bus_init(void) |