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 /arch/ia64 | |
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 'arch/ia64')
-rw-r--r-- | arch/ia64/sn/kernel/tiocx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c index 0d8592a745a7..768c21deb2e5 100644 --- a/arch/ia64/sn/kernel/tiocx.c +++ b/arch/ia64/sn/kernel/tiocx.c | |||
@@ -65,7 +65,7 @@ static int tiocx_match(struct device *dev, struct device_driver *drv) | |||
65 | 65 | ||
66 | } | 66 | } |
67 | 67 | ||
68 | static int tiocx_hotplug(struct device *dev, char **envp, int num_envp, | 68 | static int tiocx_uevent(struct device *dev, char **envp, int num_envp, |
69 | char *buffer, int buffer_size) | 69 | char *buffer, int buffer_size) |
70 | { | 70 | { |
71 | return -ENODEV; | 71 | return -ENODEV; |
@@ -79,7 +79,7 @@ static void tiocx_bus_release(struct device *dev) | |||
79 | struct bus_type tiocx_bus_type = { | 79 | struct bus_type tiocx_bus_type = { |
80 | .name = "tiocx", | 80 | .name = "tiocx", |
81 | .match = tiocx_match, | 81 | .match = tiocx_match, |
82 | .hotplug = tiocx_hotplug, | 82 | .uevent = tiocx_uevent, |
83 | }; | 83 | }; |
84 | 84 | ||
85 | /** | 85 | /** |