aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-14 05:00:38 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-21 06:56:16 -0500
commit66564d832f531c6336d6d06b6976e16b249aa532 (patch)
tree7cb1bbc940429926c713c614965381a76646e709 /drivers/video
parentd65b4e98d7ea3038b767b70fe8be959b2913f16d (diff)
FB: sa1100: avoid section mismatch warnings
WARNING: drivers/video/built-in.o(.devinit.text+0x58): Section mismatch in reference from the function sa1100fb_probe() to the function .init.text:sa1100fb_init_fbinfo() The function __devinit sa1100fb_probe() references a function __init sa1100fb_init_fbinfo(). If sa1100fb_init_fbinfo is only used by sa1100fb_probe then annotate sa1100fb_init_fbinfo with a matching annotation. WARNING: drivers/video/built-in.o(.devinit.text+0x258): Section mismatch in reference from the function sa1100fb_init_fbinfo() to the (unknown reference) .init.data:(unknown) The function __devinit sa1100fb_init_fbinfo() references a (unknown reference) __initdata (unknown). If (unknown) is only used by sa1100fb_init_fbinfo then annotate (unknown) with a matching annotation. WARNING: drivers/video/built-in.o(.devinit.text+0x26c): Section mismatch in reference from the function sa1100fb_init_fbinfo() to the (unknown reference) .init.data:(unknown) The function __devinit sa1100fb_init_fbinfo() references a (unknown reference) __initdata (unknown). If (unknown) is only used by sa1100fb_init_fbinfo then annotate (unknown) with a matching annotation. WARNING: drivers/video/built-in.o(.devinit.text+0x270): Section mismatch in reference from the function sa1100fb_init_fbinfo() to the (unknown reference) .init.data:(unknown) The function __devinit sa1100fb_init_fbinfo() references a (unknown reference) __initdata (unknown). If (unknown) is only used by sa1100fb_init_fbinfo then annotate (unknown) with a matching annotation. WARNING: drivers/video/built-in.o(.devinit.text+0x278): Section mismatch in reference from the function sa1100fb_init_fbinfo() to the (unknown reference) .init.data:(unknown) The function __devinit sa1100fb_init_fbinfo() references a (unknown reference) __initdata (unknown). If (unknown) is only used by sa1100fb_init_fbinfo then annotate (unknown) with a matching annotation. Acked-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/sa1100fb.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index 98d55d0e2da5..2cc268c0e89a 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -227,7 +227,7 @@ static struct sa1100fb_rgb def_rgb_16 = {
227 * takes an RGB666 signal, but we provide it with an RGB565 signal 227 * takes an RGB666 signal, but we provide it with an RGB565 signal
228 * instead (def_rgb_16). 228 * instead (def_rgb_16).
229 */ 229 */
230static struct sa1100fb_mach_info lq039q2ds54_info __initdata = { 230static struct sa1100fb_mach_info lq039q2ds54_info __devinitdata = {
231 .pixclock = 171521, .bpp = 16, 231 .pixclock = 171521, .bpp = 16,
232 .xres = 320, .yres = 240, 232 .xres = 320, .yres = 240,
233 233
@@ -241,7 +241,7 @@ static struct sa1100fb_mach_info lq039q2ds54_info __initdata = {
241 .lccr3 = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2), 241 .lccr3 = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),
242}; 242};
243#else 243#else
244static struct sa1100fb_mach_info pal_info __initdata = { 244static struct sa1100fb_mach_info pal_info __devinitdata = {
245 .pixclock = 67797, .bpp = 16, 245 .pixclock = 67797, .bpp = 16,
246 .xres = 640, .yres = 512, 246 .xres = 640, .yres = 512,
247 247
@@ -256,7 +256,7 @@ static struct sa1100fb_mach_info pal_info __initdata = {
256#endif 256#endif
257 257
258#ifdef CONFIG_SA1100_H3600 258#ifdef CONFIG_SA1100_H3600
259static struct sa1100fb_mach_info h3600_info __initdata = { 259static struct sa1100fb_mach_info h3600_info __devinitdata = {
260 .pixclock = 174757, .bpp = 16, 260 .pixclock = 174757, .bpp = 16,
261 .xres = 320, .yres = 240, 261 .xres = 320, .yres = 240,
262 262
@@ -279,7 +279,7 @@ static struct sa1100fb_rgb h3600_rgb_16 = {
279#endif 279#endif
280 280
281#ifdef CONFIG_SA1100_H3100 281#ifdef CONFIG_SA1100_H3100
282static struct sa1100fb_mach_info h3100_info __initdata = { 282static struct sa1100fb_mach_info h3100_info __devinitdata = {
283 .pixclock = 406977, .bpp = 4, 283 .pixclock = 406977, .bpp = 4,
284 .xres = 320, .yres = 240, 284 .xres = 320, .yres = 240,
285 285
@@ -297,7 +297,7 @@ static struct sa1100fb_mach_info h3100_info __initdata = {
297#endif 297#endif
298 298
299#ifdef CONFIG_SA1100_COLLIE 299#ifdef CONFIG_SA1100_COLLIE
300static struct sa1100fb_mach_info collie_info __initdata = { 300static struct sa1100fb_mach_info collie_info __devinitdata = {
301 .pixclock = 171521, .bpp = 16, 301 .pixclock = 171521, .bpp = 16,
302 .xres = 320, .yres = 240, 302 .xres = 320, .yres = 240,
303 303
@@ -313,7 +313,7 @@ static struct sa1100fb_mach_info collie_info __initdata = {
313#endif 313#endif
314 314
315#ifdef LART_GREY_LCD 315#ifdef LART_GREY_LCD
316static struct sa1100fb_mach_info lart_grey_info __initdata = { 316static struct sa1100fb_mach_info lart_grey_info __devinitdata = {
317 .pixclock = 150000, .bpp = 4, 317 .pixclock = 150000, .bpp = 4,
318 .xres = 320, .yres = 240, 318 .xres = 320, .yres = 240,
319 319
@@ -329,7 +329,7 @@ static struct sa1100fb_mach_info lart_grey_info __initdata = {
329}; 329};
330#endif 330#endif
331#ifdef LART_COLOR_LCD 331#ifdef LART_COLOR_LCD
332static struct sa1100fb_mach_info lart_color_info __initdata = { 332static struct sa1100fb_mach_info lart_color_info __devinitdata = {
333 .pixclock = 150000, .bpp = 16, 333 .pixclock = 150000, .bpp = 16,
334 .xres = 320, .yres = 240, 334 .xres = 320, .yres = 240,
335 335
@@ -342,7 +342,7 @@ static struct sa1100fb_mach_info lart_color_info __initdata = {
342}; 342};
343#endif 343#endif
344#ifdef LART_VIDEO_OUT 344#ifdef LART_VIDEO_OUT
345static struct sa1100fb_mach_info lart_video_info __initdata = { 345static struct sa1100fb_mach_info lart_video_info __devinitdata = {
346 .pixclock = 39721, .bpp = 16, 346 .pixclock = 39721, .bpp = 16,
347 .xres = 640, .yres = 480, 347 .xres = 640, .yres = 480,
348 348
@@ -358,7 +358,7 @@ static struct sa1100fb_mach_info lart_video_info __initdata = {
358#endif 358#endif
359 359
360#ifdef LART_KIT01_LCD 360#ifdef LART_KIT01_LCD
361static struct sa1100fb_mach_info lart_kit01_info __initdata = { 361static struct sa1100fb_mach_info lart_kit01_info __devinitdata = {
362 .pixclock = 63291, .bpp = 16, 362 .pixclock = 63291, .bpp = 16,
363 .xres = 640, .yres = 480, 363 .xres = 640, .yres = 480,
364 364
@@ -372,7 +372,7 @@ static struct sa1100fb_mach_info lart_kit01_info __initdata = {
372#endif 372#endif
373 373
374#ifdef CONFIG_SA1100_SHANNON 374#ifdef CONFIG_SA1100_SHANNON
375static struct sa1100fb_mach_info shannon_info __initdata = { 375static struct sa1100fb_mach_info shannon_info __devinitdata = {
376 .pixclock = 152500, .bpp = 8, 376 .pixclock = 152500, .bpp = 8,
377 .xres = 640, .yres = 480, 377 .xres = 640, .yres = 480,
378 378
@@ -389,7 +389,7 @@ static struct sa1100fb_mach_info shannon_info __initdata = {
389 389
390 390
391 391
392static struct sa1100fb_mach_info * __init 392static struct sa1100fb_mach_info * __devinit
393sa1100fb_get_machine_info(struct sa1100fb_info *fbi) 393sa1100fb_get_machine_info(struct sa1100fb_info *fbi)
394{ 394{
395 struct sa1100fb_mach_info *inf = NULL; 395 struct sa1100fb_mach_info *inf = NULL;
@@ -1318,7 +1318,7 @@ static int sa1100fb_resume(struct platform_device *dev)
1318 * cache. Once this area is remapped, all virtual memory 1318 * cache. Once this area is remapped, all virtual memory
1319 * access to the video memory should occur at the new region. 1319 * access to the video memory should occur at the new region.
1320 */ 1320 */
1321static int __init sa1100fb_map_video_memory(struct sa1100fb_info *fbi) 1321static int __devinit sa1100fb_map_video_memory(struct sa1100fb_info *fbi)
1322{ 1322{
1323 /* 1323 /*
1324 * We reserve one page for the palette, plus the size 1324 * We reserve one page for the palette, plus the size
@@ -1344,7 +1344,7 @@ static int __init sa1100fb_map_video_memory(struct sa1100fb_info *fbi)
1344} 1344}
1345 1345
1346/* Fake monspecs to fill in fbinfo structure */ 1346/* Fake monspecs to fill in fbinfo structure */
1347static struct fb_monspecs monspecs __initdata = { 1347static struct fb_monspecs monspecs __devinitdata = {
1348 .hfmin = 30000, 1348 .hfmin = 30000,
1349 .hfmax = 70000, 1349 .hfmax = 70000,
1350 .vfmin = 50, 1350 .vfmin = 50,
@@ -1352,7 +1352,7 @@ static struct fb_monspecs monspecs __initdata = {
1352}; 1352};
1353 1353
1354 1354
1355static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev) 1355static struct sa1100fb_info * __devinit sa1100fb_init_fbinfo(struct device *dev)
1356{ 1356{
1357 struct sa1100fb_mach_info *inf; 1357 struct sa1100fb_mach_info *inf;
1358 struct sa1100fb_info *fbi; 1358 struct sa1100fb_info *fbi;