diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:12:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:43 -0400 |
| commit | 3bd018969c57e639ebfc30042d44433e30e03d35 (patch) | |
| tree | c4cf5e282d354b4ff7ce830bd71055e5df226e59 /drivers/platform/x86/fujitsu-tablet.c | |
| parent | 15c0665c2f61d4312255d8952197e5f90a11c1e3 (diff) | |
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>
Diffstat (limited to 'drivers/platform/x86/fujitsu-tablet.c')
| -rw-r--r-- | drivers/platform/x86/fujitsu-tablet.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/platform/x86/fujitsu-tablet.c b/drivers/platform/x86/fujitsu-tablet.c index 7acae3f85f3b..f77484528b1b 100644 --- a/drivers/platform/x86/fujitsu-tablet.c +++ b/drivers/platform/x86/fujitsu-tablet.c | |||
| @@ -52,7 +52,7 @@ struct fujitsu_config { | |||
| 52 | unsigned int quirks; | 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 | KEY_RESERVED, | 56 | KEY_RESERVED, |
| 57 | KEY_RESERVED, | 57 | KEY_RESERVED, |
| 58 | KEY_RESERVED, | 58 | KEY_RESERVED, |
| @@ -71,7 +71,7 @@ static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initconst = { | |||
| 71 | KEY_LEFTALT | 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 | KEY_RESERVED, | 75 | KEY_RESERVED, |
| 76 | KEY_RESERVED, | 76 | KEY_RESERVED, |
| 77 | KEY_RESERVED, | 77 | KEY_RESERVED, |
| @@ -90,7 +90,7 @@ static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initconst = { | |||
| 90 | KEY_LEFTALT | 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 | KEY_RESERVED, | 94 | KEY_RESERVED, |
| 95 | KEY_RESERVED, | 95 | KEY_RESERVED, |
| 96 | KEY_RESERVED, | 96 | KEY_RESERVED, |
| @@ -109,7 +109,7 @@ static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initconst = { | |||
| 109 | KEY_LEFTALT | 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 | KEY_RESERVED, | 113 | KEY_RESERVED, |
| 114 | KEY_RESERVED, | 114 | KEY_RESERVED, |
| 115 | KEY_RESERVED, | 115 | KEY_RESERVED, |
| @@ -299,7 +299,7 @@ static int __devinit fujitsu_dmi_stylistic(const struct dmi_system_id *dmi) | |||
| 299 | return 1; | 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 | .callback = fujitsu_dmi_lifebook, | 304 | .callback = fujitsu_dmi_lifebook, |
| 305 | .ident = "Fujitsu Siemens P/T Series", | 305 | .ident = "Fujitsu Siemens P/T Series", |