Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3bd018969c57e639ebfc30042d44433e30e03d35

Authored by Andi Kleen
Committed by Linus Torvalds
1 parent 15c0665c2f
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches 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

sections: fix section conflicts in drivers/platform/x86 

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

drivers/platform/x86/amilo-rfkill.c
Diff comments   View file @ 3bd0189
... ... @@ -74,7 +74,7 @@
74 74 .set_block = amilo_m7440_rfkill_set_block
75 75 };
76 76  
77   -static const struct dmi_system_id __devinitdata amilo_rfkill_id_table[] = {
  77 +static const struct dmi_system_id __devinitconst amilo_rfkill_id_table[] = {
78 78 {
79 79 .matches = {
80 80 DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
drivers/platform/x86/fujitsu-tablet.c
Diff comments   View file @ 3bd0189
... ... @@ -52,7 +52,7 @@
52 52 unsigned int quirks;
53 53 };
54 54  
55   -static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initconst = {
  55 +static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initdata = {
56 56 KEY_RESERVED,
57 57 KEY_RESERVED,
58 58 KEY_RESERVED,
... ... @@ -71,7 +71,7 @@
71 71 KEY_LEFTALT
72 72 };
73 73  
74   -static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initconst = {
  74 +static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initdata = {
75 75 KEY_RESERVED,
76 76 KEY_RESERVED,
77 77 KEY_RESERVED,
... ... @@ -90,7 +90,7 @@
90 90 KEY_LEFTALT
91 91 };
92 92  
93   -static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initconst = {
  93 +static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initdata = {
94 94 KEY_RESERVED,
95 95 KEY_RESERVED,
96 96 KEY_RESERVED,
... ... @@ -109,7 +109,7 @@
109 109 KEY_LEFTALT
110 110 };
111 111  
112   -static unsigned short keymap_Stylistic_ST5xxx[KEYMAP_LEN] __initconst = {
  112 +static unsigned short keymap_Stylistic_ST5xxx[KEYMAP_LEN] __initdata = {
113 113 KEY_RESERVED,
114 114 KEY_RESERVED,
115 115 KEY_RESERVED,
... ... @@ -299,7 +299,7 @@
299 299 return 1;
300 300 }
301 301  
302   -static struct dmi_system_id dmi_ids[] __initconst = {
  302 +static const struct dmi_system_id dmi_ids[] __initconst = {
303 303 {
304 304 .callback = fujitsu_dmi_lifebook,
305 305 .ident = "Fujitsu Siemens P/T Series",
drivers/platform/x86/thinkpad_acpi.c
Diff comments   View file @ 3bd0189
... ... @@ -522,7 +522,7 @@
522 522  
523 523 #define TPACPI_HANDLE(object, parent, paths...) \
524 524 static acpi_handle object##_handle; \
525   - static const acpi_handle *object##_parent __initdata = \
  525 + static const acpi_handle * const object##_parent __initconst = \
526 526 &parent##_handle; \
527 527 static char *object##_paths[] __initdata = { paths }
528 528