summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-21 03:30:22 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-21 03:30:22 +0300
commitc522682d7433d27461d631d03a2a1a3b741e9c91 (patch)
treebb152bd80669186b3bb5495cc6067450fe15e027
parent069b6143378a17d44854619c1062393b361ebfe1 (diff)
parent7c63dedcc52c8c1253b1deec387102ef788ed0b4 (diff)
downloadlinux-c522682d7433d27461d631d03a2a1a3b741e9c91.tar.xz
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
-rw-r--r--arch/arm/mach-msm/board-qsd8x50.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index 2e8391307f55..6dde8185205f 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -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),