xserver: Branch 'master'

[Eric Anholt]

 hw/xfree86/os-support/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree e1720b1089328af80ca0cb85e5289ced05263f95 (from fd91630b73100e9d77ccb492c52807448bc772a5)
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Nov 9 18:53:37 2006 -0800

    Bug #8868: Remove drm from SUBDIRS now that the directory is gone.

diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am
index f9a888e..5ade7e8 100644
--- a/hw/xfree86/os-support/Makefile.am
+++ b/hw/xfree86/os-support/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)
-DIST_SUBDIRS = bsd bus drm misc linux lynxos solaris sysv sco usl hurd
+t -SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)
+DIST_SUBDIRS = bsd bus misc linux lynxos solaris sysv sco usl hurd
 
 sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h \
               assyntax.h xf86OSmouse.h