---

yaml --- r: 2317 b: refs/heads/master c: 419cab3 h: refs/heads/master i: 2315: ef02f0f v: v3
git-mirror · Jun 20, 2005 · 3061f67 · 3061f67
1 parent 27cc123
commit 3061f67
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);
 };