Re: xf86-video-mga fails to compile (on i386)

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Mon, Feb 23, 2015 at 12:52:38PM +0100, Kurt Schreiner wrote:
> with -current source cvs-updated some minutes ago:
> 
>     compile  xf86-video-mga/mga_dac3026.pico
> /u/NetBSD/xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c: In function 'MGA3026Save':
> /u/NetBSD/xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c:856:5: error: passing argument 2 of 'pci_device_cfg_read_u32' from incompatible pointer type [-Werror]
>      PCI_OPTION_REG);
>      ^
> In file included from /u/NetBSD/arch/i386/dest/usr/X11R7/include/xorg/xf86Pci.h:109:0,
>                  from /u/NetBSD/arch/i386/dest/usr/X11R7/include/xorg/xf86str.h:44,
>                  from /u/NetBSD/arch/i386/dest/usr/X11R7/include/xorg/xf86.h:44,
>                  from /u/NetBSD/xsrc/external/mit/xf86-video-mga/dist/src/mga_dac3026.c:42:
> /u/NetBSD/arch/i386/dest/usr/X11R7/include/pciaccess.h:153:5: note: expected '__uint32_t *' but argument is of type 'CARD32 *'
>  int pci_device_cfg_read_u32(struct pci_device *dev, uint32_t *data,
>      ^
> dependall ===> external/mit/xorg/bin/revpath
> cc1: all warnings being treated as errors
> --- mga_dac3026.pico ---
> *** [mga_dac3026.pico] Error code 1
> 
> nbmake[10]: stopped in /u/NetBSD/src/external/mit/xorg/server/drivers/xf86-video-mga
> 

My fault, I've tried reducing diffs to upstream and it seems I went to far.
I restored a part of the diff, is it enough? If not, please send the next error.
 Thomas