xserver: Branch 'master'

[Alan Hourihane]

 hw/xfree86/Makefile.am |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 66a87517bd80b21e107df9d57968d81a92f91fd5
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date:   Wed Oct 15 12:00:16 2008 +0100

    re-enable DRI2

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index eff2c31..98d7ec8 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -4,9 +4,9 @@ if DRI
 DRI_SUBDIR = dri
 endif
 
-#if DRI2
-#DRI2_SUBDIR = dri2
-#endif
+if DRI2
+DRI2_SUBDIR = dri2
+endif
 
 if XF86UTILS
 XF86UTILS_SUBDIR = utils