Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 556f00ede819c20eaf2af9017a78c713b33ca4e7

Authored by Andi Kleen
Committed by Linus Torvalds
1 parent 16bd9b8782
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

sections: fix section conflicts in drivers/video 

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 5 changed files with 6 additions and 6 deletions Side-by-side Diff

drivers/video/aty/aty128fb.c
Diff comments   View file @ 556f00e
... ... @@ -149,7 +149,7 @@
149 149 };
150 150  
151 151 /* Must match above enum */
152   -static const char *r128_family[] __devinitdata = {
  152 +static char * const r128_family[] __devinitconst = {
153 153 "AGP",
154 154 "PCI",
155 155 "PRO AGP",
drivers/video/geode/gx1fb_core.c
Diff comments   View file @ 556f00e
... ... @@ -29,7 +29,7 @@
29 29 static char panel_option[32] = "";
30 30  
31 31 /* Modes relevant to the GX1 (taken from modedb.c) */
32   -static const struct fb_videomode __devinitdata gx1_modedb[] = {
  32 +static const struct fb_videomode __devinitconst gx1_modedb[] = {
33 33 /* 640x480-60 VESA */
34 34 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
35 35 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
drivers/video/gxt4500.c
Diff comments   View file @ 556f00e
... ... @@ -156,7 +156,7 @@
156 156 static char *mode_option;
157 157  
158 158 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
159   -static const struct fb_videomode defaultmode __devinitdata = {
  159 +static const struct fb_videomode defaultmode __devinitconst = {
160 160 .refresh = 60,
161 161 .xres = 1280,
162 162 .yres = 1024,
... ... @@ -581,7 +581,7 @@
581 581 return 0;
582 582 }
583 583  
584   -static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
  584 +static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
585 585 .id = "IBM GXT4500P",
586 586 .type = FB_TYPE_PACKED_PIXELS,
587 587 .visual = FB_VISUAL_PSEUDOCOLOR,
drivers/video/i810/i810_main.c
Diff comments   View file @ 556f00e
... ... @@ -97,7 +97,7 @@
97 97 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
98 98  
99 99 /* PCI */
100   -static const char *i810_pci_list[] __devinitdata = {
  100 +static const char * const i810_pci_list[] __devinitconst = {
101 101 "Intel(R) 810 Framebuffer Device" ,
102 102 "Intel(R) 810-DC100 Framebuffer Device" ,
103 103 "Intel(R) 810E Framebuffer Device" ,
drivers/video/jz4740_fb.c
Diff comments   View file @ 556f00e
... ... @@ -136,7 +136,7 @@
136 136 uint32_t pseudo_palette[16];
137 137 };
138 138  
139   -static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
  139 +static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
140 140 .id = "JZ4740 FB",
141 141 .type = FB_TYPE_PACKED_PIXELS,
142 142 .visual = FB_VISUAL_TRUECOLOR,