evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sections: fix section conflicts in drivers/platform/x86

Browse source 
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>
This commit is contained in:
Andi Kleen 2012-10-04 17:12:01 -07:00 • committed by Linus Torvalds
parent 15c0665c2f
commit 3bd018969c
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/platform/x86/amilo-rfkill.c
View file

@ -74,7 +74,7 @@ static const struct rfkill_ops amilo_m7440_rfkill_ops = {
.set_block = amilo_m7440_rfkill_set_block .set_block = amilo_m7440_rfkill_set_block
}; };
static const struct dmi_system_id __devinitdata amilo_rfkill_id_table[] = { static const struct dmi_system_id __devinitconst amilo_rfkill_id_table[] = {
{ {
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),

10
drivers/platform/x86/fujitsu-tablet.c
View file

@ -52,7 +52,7 @@ struct fujitsu_config {
unsigned int quirks; unsigned int quirks;
}; };
static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initconst = { static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initdata = {
KEY_RESERVED, KEY_RESERVED,
KEY_RESERVED, KEY_RESERVED,
KEY_RESERVED, KEY_RESERVED,
@ -71,7 +71,7 @@ static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initconst = {
KEY_LEFTALT KEY_LEFTALT
}; };
static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initconst = { static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initdata = {
KEY_RESERVED, KEY_RESERVED,
KEY_RESERVED, KEY_RESERVED,
KEY_RESERVED, KEY_RESERVED,
@ -90,7 +90,7 @@ static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initconst = {
KEY_LEFTALT KEY_LEFTALT
}; };
static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initconst = { static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initdata = {
KEY_RESERVED, KEY_RESERVED,
KEY_RESERVED, KEY_RESERVED,
KEY_RESERVED, KEY_RESERVED,
@ -109,7 +109,7 @@ static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initconst = {
KEY_LEFTALT KEY_LEFTALT
}; };
static unsigned short keymap_Stylistic_ST5xxx[KEYMAP_LEN] __initconst = { static unsigned short keymap_Stylistic_ST5xxx[KEYMAP_LEN] __initdata = {
KEY_RESERVED, KEY_RESERVED,
KEY_RESERVED, KEY_RESERVED,
KEY_RESERVED, KEY_RESERVED,
@ -299,7 +299,7 @@ static int __devinit fujitsu_dmi_stylistic(const struct dmi_system_id *dmi)
return 1; return 1;
} }
static struct dmi_system_id dmi_ids[] __initconst = { static const struct dmi_system_id dmi_ids[] __initconst = {
{ {
.callback = fujitsu_dmi_lifebook, .callback = fujitsu_dmi_lifebook,
.ident = "Fujitsu Siemens P/T Series", .ident = "Fujitsu Siemens P/T Series",

2
drivers/platform/x86/thinkpad_acpi.c
View file

@ -522,7 +522,7 @@ static acpi_handle ec_handle;
#define TPACPI_HANDLE(object, parent, paths...) \ #define TPACPI_HANDLE(object, parent, paths...) \
static acpi_handle object##_handle; \ static acpi_handle object##_handle; \
static const acpi_handle *object##_parent __initdata = \ static const acpi_handle * const object##_parent __initconst = \
&parent##_handle; \ &parent##_handle; \
static char *object##_paths[] __initdata = { paths } static char *object##_paths[] __initdata = { paths }