diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 14:40:05 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 14:40:05 +0000 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /arch/arm/common | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'arch/arm/common')
| -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 2bb0ce81bb6..1bbdd1693d5 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) } #ifdef CONFIG_HOTPLUG -static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf, int bufsz) +static int amba_uevent(struct device *dev, char **envp, int nr_env, char *buf, int bufsz) { struct amba_device *pcdev = to_amba_device(dev); @@ -58,7 +58,7 @@ static int amba_hotplug(struct device *dev, char **envp, int nr_env, char *buf, return 0; } #else -#define amba_hotplug NULL +#define amba_uevent NULL #endif static int amba_suspend(struct device *dev, pm_message_t state) @@ -88,7 +88,7 @@ static int amba_resume(struct device *dev) static struct bus_type amba_bustype = { .name = "amba", .match = amba_match, - .hotplug = amba_hotplug, + .uevent = amba_uevent, .suspend = amba_suspend, .resume = amba_resume, }; |