From 3061f678d9333021fb948590eb3ac73ebc82ab00 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Tue, 26 Apr 2005 02:32:54 -0500
Subject: [PATCH] --- yaml --- r: 2317 b: refs/heads/master c:
 419cab3fc69588ebe35b845cc3a584ae172463de h: refs/heads/master i:   2315:
 ef02f0fe38825d6de509748f4835d9c8524c5695 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/base/class.c    | 2 +-
 trunk/drivers/base/core.c     | 2 +-
 trunk/include/linux/kobject.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 30b8b3fb896a..7ae3898bae15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3b4f3c6dec04c6c8261fe22645f07b39976595a
+refs/heads/master: 419cab3fc69588ebe35b845cc3a584ae172463de
diff --git a/trunk/drivers/base/class.c b/trunk/drivers/base/class.c
index d2a2f8f2b4ed..ff33ebbf1dc7 100644
--- a/trunk/drivers/base/class.c
+++ b/trunk/drivers/base/class.c
@@ -262,7 +262,7 @@ static int class_hotplug_filter(struct kset *kset, struct kobject *kobj)
 	return 0;
 }
 
-static char *class_hotplug_name(struct kset *kset, struct kobject *kobj)
+static const char *class_hotplug_name(struct kset *kset, struct kobject *kobj)
 {
 	struct class_device *class_dev = to_class_dev(kobj);
 
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index fbc223486f81..32f3f09a42e0 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -102,7 +102,7 @@ static int dev_hotplug_filter(struct kset *kset, struct kobject *kobj)
 	return 0;
 }
 
-static char *dev_hotplug_name(struct kset *kset, struct kobject *kobj)
+static const char *dev_hotplug_name(struct kset *kset, struct kobject *kobj)
 {
 	struct device *dev = to_dev(kobj);
 
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
index 76dc67245c0c..3b22304f12fd 100644
--- a/trunk/include/linux/kobject.h
+++ b/trunk/include/linux/kobject.h
@@ -94,7 +94,7 @@ struct kobj_type {
  */
 struct kset_hotplug_ops {
 	int (*filter)(struct kset *kset, struct kobject *kobj);
-	char *(*name)(struct kset *kset, struct kobject *kobj);
+	const char *(*name)(struct kset *kset, struct kobject *kobj);
 	int (*hotplug)(struct kset *kset, struct kobject *kobj, char **envp,
 			int num_envp, char *buffer, int buffer_size);
 };