kobject: put kobject_actions in kobject.h

This prevents the extern declaration in the driver core.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 3599ab2506d269ee299b1b8e807746bcbca98391..b9bb3995db8422788e3a139f86ad353159557643 100644 (file)
--- a/drivers/base/core.c
+++ b/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/include/linux/kobject.h b/include/linux/kobject.h
index aa2fe22b1baa64aa9e54c8b1bf4d5b3207956ac0..49a08f84d7c38370425cb7f821db652524433a3e 100644 (file)
--- a/include/linux/kobject.h
+++ b/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];