xserver: Branch 'master'

[Alan Coopersmith]

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

New commits:
commit 78aedbe609e309446e71835ed15e4557d3ccf723
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Fri Jul 10 17:35:57 2009 -0700

    Fix int10 module build after typo in commit 2638e9899
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 957cb17..898c9b8 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -30,7 +30,7 @@ endif
 
 DOC_SUBDIR = doc
 
-SUBDIRS = common ddc i2c x86emu $(INT10MODULE) fbdevhw os-support parser \
+SUBDIRS = common ddc i2c x86emu $(INT10_SUBDIR) fbdevhw os-support parser \
 	  ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
 	  xf8_16bpp loader dixmods exa modes \
 	  $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)