xserver: Branch 'master'

[Remi Cardona]

 hw/xfree86/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9480725af0275b72b24b9e1cb3b68d5b97288d01
Author: Rémi Cardona <remi at gentoo.org>
Date:   Wed Jun 24 10:12:50 2009 +0200

    xfree86: DIST_SUBDIRS should not contain variables
    
    This patch reverts a change done in commit
    800d4ceb946c93724661ebfd28afb658ca63b6b1 to add conditional XAA support
    
    Signed-off-by: Rémi Cardona <remi at gentoo.org>

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 9d5731d..eb487f6 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support parser \
 	  $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
 
 DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
-               parser ramdac shadowfb vbe vgahw $(XAA_SUBDIR) \
+               parser ramdac shadowfb vbe vgahw xaa \
                xf8_16bpp loader dixmods dri dri2 exa modes \
 	       utils doc