diff --git a/[refs] b/[refs]
index ad81ee8b3357..0bb54574c7f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd030c4cb3ee0cd4f0589a5f723d358cca1f7a9a
+refs/heads/master: ff2ee8cf30199bb625706a43d9cc3bd1ff5ebe42
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index 3599ab2506d2..b9bb3995db84 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -24,8 +24,6 @@
 #include "base.h"
 #include "power/power.h"
 
-extern const char *kobject_actions[];
-
 int (*platform_notify)(struct device * dev) = NULL;
 int (*platform_notify_remove)(struct device * dev) = NULL;
 
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
index aa2fe22b1baa..49a08f84d7c3 100644
--- a/trunk/include/linux/kobject.h
+++ b/trunk/include/linux/kobject.h
@@ -56,6 +56,9 @@ enum kobject_action {
 	KOBJ_MAX
 };
 
+/* The list of strings defining the valid kobject actions as specified above */
+extern const char *kobject_actions[];
+
 struct kobject {
 	const char		* k_name;
 	char			name[KOBJ_NAME_LEN];