From: Andrew Morton Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/macintosh/macio_asic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/macintosh/macio_asic.c~gregkh-driver-merge-hotplug-and-uevent-macio_asic-fix drivers/macintosh/macio_asic.c --- 25/drivers/macintosh/macio_asic.c~gregkh-driver-merge-hotplug-and-uevent-macio_asic-fix 2005-11-23 03:28:22.000000000 -0700 +++ 25-akpm/drivers/macintosh/macio_asic.c 2005-11-23 03:28:55.000000000 -0700 @@ -128,7 +128,7 @@ static int macio_device_resume(struct de return 0; } -static int macio_hotplug (struct device *dev, char **envp, int num_envp, +static int macio_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size) { struct macio_dev * macio_dev; @@ -203,7 +203,7 @@ extern struct device_attribute macio_dev struct bus_type macio_bus_type = { .name = "macio", .match = macio_bus_match, - .hotplug = macio_hotplug, + .uevent = macio_uevent, .suspend = macio_device_suspend, .resume = macio_device_resume, .dev_attrs = macio_dev_attrs, _