diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
| commit | db9edfd7e339ca4113153d887e782dd05be5a9eb (patch) | |
| tree | 0a4ba12447a0cabc800adc7e9667d284777b0181 /arch/ia64 | |
| parent | 631b034724364b413e8a52e7c2e03a9d77e4c2b4 (diff) | |
| parent | fd586bacf439f36dea9b9bf6e6133ac87df2730c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Trivial manual merge fixup for usb_find_interface clashes.
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 | /** |