aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorPaul Jackson <pj@sgi.com>2005-11-25 23:04:26 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-04 19:18:08 -0500
commit6d20b035dee4300e9786c6e1cb77a765c7f9460a (patch)
tree104596b8fca1f4946da8d499a8429e5decf7e2d9 /arch/arm/common
parent712f47cea7703a340406fde61e84eb86ce781988 (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/arm/common')
-rw-r--r--arch/arm/common/amba.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/common/amba.c b/arch/arm/common/amba.c
index e1013112c354..c95ec9eab996 100644
--- a/arch/arm/common/amba.c
+++ b/arch/arm/common/amba.c
@@ -45,7 +45,7 @@ static int amba_match(struct device *dev, struct device_driver *drv)
45} 45}
46 46
47#ifdef CONFIG_HOTPLUG 47#ifdef CONFIG_HOTPLUG
48static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf, int bufsz) 48static int amba_uevent(struct device *dev, char **envp, int nr_env, char *buf, int bufsz)
49{ 49{
50 struct amba_device *pcdev = to_amba_device(dev); 50 struct amba_device *pcdev = to_amba_device(dev);
51 51
@@ -58,7 +58,7 @@ static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf,
58 return 0; 58 return 0;
59} 59}
60#else 60#else
61#define amba_hotplug NULL 61#define amba_uevent NULL
62#endif 62#endif
63 63
64static int amba_suspend(struct device *dev, pm_message_t state) 64static int amba_suspend(struct device *dev, pm_message_t state)
@@ -88,7 +88,7 @@ static int amba_resume(struct device *dev)
88static struct bus_type amba_bustype = { 88static struct bus_type amba_bustype = {
89 .name = "amba", 89 .name = "amba",
90 .match = amba_match, 90 .match = amba_match,
91 .hotplug = amba_hotplug, 91 .uevent = amba_uevent,
92 .suspend = amba_suspend, 92 .suspend = amba_suspend,
93 .resume = amba_resume, 93 .resume = amba_resume,
94}; 94};