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
This commit is contained in:
Linus Torvalds 2011-01-20 16:30:22 -08:00
commit c522682d74

View File

@ -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 * at run-time: they vary from board to board, and the true
* configuration won't be known until boot. * configuration won't be known until boot.
*/ */
static struct resource smc91x_resources[] __initdata = { static struct resource smc91x_resources[] = {
[0] = { [0] = {
.flags = IORESOURCE_MEM, .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", .name = "smc91x",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(smc91x_resources), .num_resources = ARRAY_SIZE(smc91x_resources),