From c3137e3b1913d404a8a6ab180a6c75e329e8841a Mon Sep 17 00:00:00 2001 From: wanzongshun Date: Thu, 10 Nov 2011 07:05:41 +0100 Subject: [PATCH] --- yaml --- r: 275639 b: refs/heads/master c: a6dc54460e5405248773abef704c7980ab31af77 h: refs/heads/master i: 275637: 3c0d8ac6a1f0d3a1d676cd96fb460fe6af568fca 275635: b616b3bc3c1f023d3f30698a3d10b8527365893f 275631: c1c82ea3bbb867c5d9055e83c1dade3c1a6ec109 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-w90x900/dev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cd45c64c0cce..ee1536c6ba7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7c86c7b264c57b4d6d121c48ce3be98a2e6f8c5 +refs/heads/master: a6dc54460e5405248773abef704c7980ab31af77 diff --git a/trunk/arch/arm/mach-w90x900/dev.c b/trunk/arch/arm/mach-w90x900/dev.c index 7a1fa6adb7c3..5b0c38abacc1 100644 --- a/trunk/arch/arm/mach-w90x900/dev.c +++ b/trunk/arch/arm/mach-w90x900/dev.c @@ -422,7 +422,7 @@ struct platform_device nuc900_device_kpi = { /* LCD controller*/ -static struct nuc900fb_display __initdata nuc900_lcd_info[] = { +static struct nuc900fb_display nuc900_lcd_info[] = { /* Giantplus Technology GPM1040A0 320x240 Color TFT LCD */ [0] = { .type = LCM_DCCS_VA_SRC_RGB565, @@ -445,7 +445,7 @@ static struct nuc900fb_display __initdata nuc900_lcd_info[] = { }, }; -static struct nuc900fb_mach_info nuc900_fb_info __initdata = { +static struct nuc900fb_mach_info nuc900_fb_info = { #if defined(CONFIG_GPM1040A0_320X240) .displays = &nuc900_lcd_info[0], #else