diff options
author | Paul Jackson <pj@sgi.com> | 2005-11-25 23:04:26 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-04 19:18:08 -0500 |
commit | 6d20b035dee4300e9786c6e1cb77a765c7f9460a (patch) | |
tree | 104596b8fca1f4946da8d499a8429e5decf7e2d9 /drivers/s390/cio/device.c | |
parent | 712f47cea7703a340406fde61e84eb86ce781988 (diff) |
[PATCH] driver kill hotplug word from sn and others fix
The first of these changes s/hotplug/uevent/ was needed to
compile sn2_defconfig (ia64/sn). The other three files
changed are blind changes of all remaining bus_type.hotplug
references I could find to bus_type.uevent.
This patch attempts to finish similar changes made in the
gregkh-driver-kill-hotplug-word-from-driver-core Nov 22 patch.
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/s390/cio/device.c')
-rw-r--r-- | drivers/s390/cio/device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 811c9d150637..85908cacc3b8 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
@@ -59,7 +59,7 @@ ccw_bus_match (struct device * dev, struct device_driver * drv) | |||
59 | * Heavily modeled on pci and usb hotplug. | 59 | * Heavily modeled on pci and usb hotplug. |
60 | */ | 60 | */ |
61 | static int | 61 | static int |
62 | ccw_hotplug (struct device *dev, char **envp, int num_envp, | 62 | ccw_uevent (struct device *dev, char **envp, int num_envp, |
63 | char *buffer, int buffer_size) | 63 | char *buffer, int buffer_size) |
64 | { | 64 | { |
65 | struct ccw_device *cdev = to_ccwdev(dev); | 65 | struct ccw_device *cdev = to_ccwdev(dev); |
@@ -110,7 +110,7 @@ ccw_hotplug (struct device *dev, char **envp, int num_envp, | |||
110 | struct bus_type ccw_bus_type = { | 110 | struct bus_type ccw_bus_type = { |
111 | .name = "ccw", | 111 | .name = "ccw", |
112 | .match = &ccw_bus_match, | 112 | .match = &ccw_bus_match, |
113 | .hotplug = &ccw_hotplug, | 113 | .uevent = &ccw_uevent, |
114 | }; | 114 | }; |
115 | 115 | ||
116 | static int io_subchannel_probe (struct device *); | 116 | static int io_subchannel_probe (struct device *); |