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

Commit 2934578e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform fixlet from Ingo Molnar:
 "A single __initdata fix"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/geode: Fix incorrect placement of __initdata tag
parents 2612c49d a6d30e0f

arch/x86/platform/geode/alix.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static struct platform_device alix_leds_dev = { 
	.dev.platform_data = &alix_leds_data,

};



static struct __initdata platform_device *alix_devs[] = {

static struct platform_device *alix_devs[] __initdata = {

	&alix_buttons_dev,

	&alix_leds_dev,

};

arch/x86/platform/geode/geos.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static struct platform_device geos_leds_dev = { 
	.dev.platform_data = &geos_leds_data,

};



static struct __initdata platform_device *geos_devs[] = {

static struct platform_device *geos_devs[] __initdata = {

	&geos_buttons_dev,

	&geos_leds_dev,

};

arch/x86/platform/geode/net5501.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static struct platform_device net5501_leds_dev = { 
	.dev.platform_data = &net5501_leds_data,

};



static struct __initdata platform_device *net5501_devs[] = {

static struct platform_device *net5501_devs[] __initdata = {

	&net5501_buttons_dev,

	&net5501_leds_dev,

};