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

Commit c522682d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-38-rc2' of git://codeaurora.org/quic/kernel/davidb/linux-msm 

* 'for-38-rc2' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
  msm: qsd8x50: Platform data isn't init data
parents 069b6143 7c63dedc

arch/arm/mach-msm/board-qsd8x50.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static const unsigned qsd8x50_surf_smc91x_gpio __initdata = 156; 
 * at run-time: they vary from board to board, and the true

 * configuration won't be known until boot.

 */

static struct resource smc91x_resources[] __initdata = {

static struct resource smc91x_resources[] = {

	[0] = {

		.flags = IORESOURCE_MEM,

	},
@@ -52,7 +52,7 @@ static struct resource smc91x_resources[] __initdata = { 
	},

};



static struct platform_device smc91x_device __initdata = {

static struct platform_device smc91x_device = {

	.name           = "smc91x",

	.id             = 0,

	.num_resources  = ARRAY_SIZE(smc91x_resources),