From: Andy Whitcroft The hotplug ops name entry for memory (memory_hotplug_name) should be const. This fixes a compiler warning when HOTPLUG is enabled. Signed-off-by: Andy Whitcroft Signed-off-by: Andrew Morton --- drivers/base/memory.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/base/memory.c~memhotplug-memory_hotplug_name-should-be-const drivers/base/memory.c --- 25/drivers/base/memory.c~memhotplug-memory_hotplug_name-should-be-const Mon Nov 14 15:23:48 2005 +++ 25-akpm/drivers/base/memory.c Mon Nov 14 15:23:48 2005 @@ -30,7 +30,7 @@ static struct sysdev_class memory_sysdev }; EXPORT_SYMBOL(memory_sysdev_class); -static char *memory_hotplug_name(struct kset *kset, struct kobject *kobj) +static const char *memory_hotplug_name(struct kset *kset, struct kobject *kobj) { return MEMORY_CLASS_NAME; } _