diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
| commit | ed03f430cdc8c802652467e9097606fedc2c7abc (patch) | |
| tree | 30941ec1e6f93e99358fefe18175e5dd800a4379 /arch/ia64/sn/kernel/tiocx.c | |
| parent | ed349a8a0a780ed27e2a765f16cee54d9b63bfee (diff) | |
| parent | 6f957eaf79356a32e838f5f262ee9a60544b1d5b (diff) | |
Pull pnpacpi into acpica branch
Diffstat (limited to 'arch/ia64/sn/kernel/tiocx.c')
| -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 | /** |