xf86-video-mga: Changes to 'master'

[Peter Hutterer]

 configure.ac     |    4 ++--
 src/mga.h        |   10 +++++++---
 src/mga_driver.c |   32 ++++++++++++++++----------------
 src/mga_exa.c    |    8 ++++----
 src/mga_macros.h |    4 ++--
 src/mga_merge.c  |    2 +-
 src/mga_storm.c  |    8 ++++----
 7 files changed, 36 insertions(+), 32 deletions(-)

New commits:
commit 4c4beaf628c9c5dd531605e40696ed31db0e97b8
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Jan 4 15:15:07 2012 +1000

    Untangle XF86DRI from the driver-specific DRI define
    
    XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
    itself does exactly nothing other than not fill in the CFLAGS
    and thus stop the driver from compiling.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>