From 91d7a32a2587d9c0a18cd34f9c5dff74a279bd79 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Sat, 22 Apr 2006 12:14:44 +0200
Subject: [PATCH] --- yaml --- r: 26241 b: refs/heads/master c:
 5b3ef14e3e9d745a512d65fcb4ef9be541226d80 h: refs/heads/master i:   26239:
 5489bd0abf6c1a29108096ca39249b597e186c2a v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/kobject.h | 1 -
 trunk/lib/kobject.c           | 7 ++-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 57ffe50e1f17..7f80e8bebd5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bde11d794206ae8d72defd0e8a481181200f7dc4
+refs/heads/master: 5b3ef14e3e9d745a512d65fcb4ef9be541226d80
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
index e38bb357282a..c187c53cecd0 100644
--- a/trunk/include/linux/kobject.h
+++ b/trunk/include/linux/kobject.h
@@ -257,7 +257,6 @@ struct subsys_attribute {
 };
 
 extern int subsys_create_file(struct subsystem * , struct subsys_attribute *);
-extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *);
 
 #if defined(CONFIG_HOTPLUG)
 void kobject_uevent(struct kobject *kobj, enum kobject_action action);
diff --git a/trunk/lib/kobject.c b/trunk/lib/kobject.c
index 01d957513940..b46350c27837 100644
--- a/trunk/lib/kobject.c
+++ b/trunk/lib/kobject.c
@@ -422,7 +422,6 @@ struct kobject *kobject_add_dir(struct kobject *parent, const char *name)
 
 	return k;
 }
-EXPORT_SYMBOL_GPL(kobject_add_dir);
 
 /**
  *	kset_init - initialize a kset for use
@@ -569,7 +568,7 @@ int subsys_create_file(struct subsystem * s, struct subsys_attribute * a)
  *	@s:	subsystem.
  *	@a:	attribute desciptor.
  */
-
+#if 0
 void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a)
 {
 	if (subsys_get(s)) {
@@ -577,6 +576,7 @@ void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a)
 		subsys_put(s);
 	}
 }
+#endif  /*  0  */
 
 EXPORT_SYMBOL(kobject_init);
 EXPORT_SYMBOL(kobject_register);
@@ -588,10 +588,7 @@ EXPORT_SYMBOL(kobject_del);
 
 EXPORT_SYMBOL(kset_register);
 EXPORT_SYMBOL(kset_unregister);
-EXPORT_SYMBOL(kset_find_obj);
 
-EXPORT_SYMBOL(subsystem_init);
 EXPORT_SYMBOL(subsystem_register);
 EXPORT_SYMBOL(subsystem_unregister);
 EXPORT_SYMBOL(subsys_create_file);
-EXPORT_SYMBOL(subsys_remove_file);