Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ff2ee8cf30199bb625706a43d9cc3bd1ff5ebe42

Authored by Greg Kroah-Hartman
1 parent cd030c4cb3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

... ... @@ -24,8 +24,6 @@
24 24 #include "base.h"
25 25 #include "power/power.h"
26 26  
27   -extern const char *kobject_actions[];
28   -
29 27 int (*platform_notify)(struct device * dev) = NULL;
30 28 int (*platform_notify_remove)(struct device * dev) = NULL;
31 29  
include/linux/kobject.h
Diff comments   View file @ ff2ee8c
... ... @@ -56,6 +56,9 @@
56 56 KOBJ_MAX
57 57 };
58 58  
  59 +/* The list of strings defining the valid kobject actions as specified above */
  60 +extern const char *kobject_actions[];
  61 +
59 62 struct kobject {
60 63 const char * k_name;
61 64 char name[KOBJ_NAME_LEN];