diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /arch/arm/common/amba.c | |
parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) |
Merge with Linus' kernel.
Diffstat (limited to 'arch/arm/common/amba.c')
-rw-r--r-- | arch/arm/common/amba.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/common/amba.c b/arch/arm/common/amba.c index 2bb0ce81bb69..1bbdd1693d57 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 |
48 | static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf, int bufsz) | 48 | static 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 | ||
64 | static int amba_suspend(struct device *dev, pm_message_t state) | 64 | static int amba_suspend(struct device *dev, pm_message_t state) |
@@ -88,7 +88,7 @@ static int amba_resume(struct device *dev) | |||
88 | static struct bus_type amba_bustype = { | 88 | static 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 | }; |