Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bd01896 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

sections: fix section conflicts in drivers/platform/x86 



Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 15c0665c

drivers/platform/x86/amilo-rfkill.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static const struct rfkill_ops amilo_m7440_rfkill_ops = { 
	.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 = {

			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),

drivers/platform/x86/fujitsu-tablet.c

+5 −5
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct fujitsu_config { 
	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,
@@ -71,7 +71,7 @@ static unsigned short keymap_Lifebook_Tseries[KEYMAP_LEN] __initconst = { 
	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,
@@ -90,7 +90,7 @@ static unsigned short keymap_Lifebook_U810[KEYMAP_LEN] __initconst = { 
	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,
@@ -109,7 +109,7 @@ static unsigned short keymap_Stylistic_Tseries[KEYMAP_LEN] __initconst = { 
	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,
@@ -299,7 +299,7 @@ static int __devinit fujitsu_dmi_stylistic(const struct dmi_system_id *dmi) 
	return 1;

}



static struct dmi_system_id dmi_ids[] __initconst = {

static const struct dmi_system_id dmi_ids[] __initconst = {

	{

		.callback = fujitsu_dmi_lifebook,

		.ident = "Fujitsu Siemens P/T Series",

drivers/platform/x86/thinkpad_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ static acpi_handle ec_handle; 


#define TPACPI_HANDLE(object, parent, paths...)			\

	static acpi_handle  object##_handle;			\

	static const acpi_handle *object##_parent __initdata =	\

	static const acpi_handle * const object##_parent __initconst =	\

						&parent##_handle; \

	static char *object##_paths[] __initdata = { paths }