diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 19:42:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 19:42:40 +0100 |
| commit | 3e2b32b69308e974cd1167beaf266d3c716e4734 (patch) | |
| tree | 0f1b24dcb7b066a6322d33235b95655d885695ac /drivers/sh/superhyway/superhyway.c | |
| parent | [PATCH] remove unused tmp_buf_sem's (diff) | |
| parent | [PATCH] device_shutdown can loop if the driver frees itself (diff) | |
| download | linux-3e2b32b69308e974cd1167beaf266d3c716e4734.tar.xz linux-3e2b32b69308e974cd1167beaf266d3c716e4734.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
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) |