Commit fcb1fec7fece6b9889deaedf5b7d21f4f5a26381

Authored by Paul Mundt
1 parent b2839ed83f

fb: pvr2fb: Fix up remaining section mismatch.

Building with CONFIG_DEBUG_SECTION_MISMATCH=y reports:

  CC      drivers/video/pvr2fb.o
  LD      drivers/video/built-in.o
WARNING: drivers/video/built-in.o(.text+0xb9b0): Section mismatch in reference from the function pvr2fb_check_var() to the variable .devinit.data:pvr2_fix
The function pvr2fb_check_var() references
the variable __devinitdata pvr2_fix.
This is often because pvr2fb_check_var lacks a __devinitdata
annotation or the annotation of pvr2_fix is wrong.

This is obviously crap as no such reference exists, but it's a bit
closer to reality from older versions which blamed the PCI table. The
real problem was a reference to pvr2_var.vmode from pvr2fb_check_var(),
as pvr2_var is flagged as __devinitdata (pvr2_fix is also, so at least
that part is right).

pvr2_var.vmode is just a fancy way of saying FB_VMODE_NONINTERLACED, so
we just reference that explicitly instead.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Showing 1 changed file with 4 additions and 8 deletions Side-by-side Diff

drivers/video/pvr2fb.c
1   -/* drivers/video/pvr2fb.c
  1 +/*
  2 + * drivers/video/pvr2fb.c
2 3 *
3 4 * Frame buffer and fbcon support for the NEC PowerVR2 found within the Sega
4 5 * Dreamcast.
5 6 *
6 7 * Copyright (c) 2001 M. R. Brown <mrbrown@0xd6.org>
7   - * Copyright (c) 2001, 2002, 2003, 2004, 2005 Paul Mundt <lethal@linux-sh.org>
  8 + * Copyright (c) 2001 - 2008 Paul Mundt <lethal@linux-sh.org>
8 9 *
9   - * This file is part of the LinuxDC project (linuxdc.sourceforge.net).
10   - *
11   - */
12   -
13   -/*
14 10 * This driver is mostly based on the excellent amifb and vfb sources. It uses
15 11 * an odd scheme for converting hardware values to/from framebuffer values,
16 12 * here are some hacked-up formulas:
... ... @@ -490,7 +486,7 @@
490 486 } else {
491 487 var->sync &= ~FB_SYNC_BROADCAST;
492 488 var->vmode &= ~FB_VMODE_INTERLACED;
493   - var->vmode |= pvr2_var.vmode;
  489 + var->vmode |= FB_VMODE_NONINTERLACED;
494 490 }
495 491  
496 492 if ((var->activate & FB_ACTIVATE_MASK) != FB_ACTIVATE_TEST) {