Module Name: src
Committed By: mrg
Date: Tue Jun 23 04:39:52 UTC 2009
Modified Files:
src/distrib/sets/lists/xserver: md.alpha md.amd64 md.cats md.i386
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
Log Message:
don't build the vga or nsc drivers -- they haven't been ported to
xorg-server 1.6 yet. remove them from the list of drivers to try
to load with "X -configure". (someone should also confirm that
this list of drivers is right.)
this should fix PR#41626.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xserver/md.cats
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.28 -r1.29 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.20 src/distrib/sets/lists/xserver/md.alpha:1.21
--- src/distrib/sets/lists/xserver/md.alpha:1.20 Thu Jun 18 05:57:34 2009
+++ src/distrib/sets/lists/xserver/md.alpha Tue Jun 23 04:39:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.20 2009/06/18 05:57:34 mrg Exp $
+# $NetBSD: md.alpha,v 1.21 2009/06/23 04:39:52 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XalphaNetBSD -unknown- x11
./usr/X11R6/bin/XdecNetBSD -unknown- x11
@@ -97,8 +97,8 @@
./usr/X11R7/lib/modules/drivers/trident_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/tseng_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.49 src/distrib/sets/lists/xserver/md.amd64:1.50
--- src/distrib/sets/lists/xserver/md.amd64:1.49 Thu Jun 18 05:57:34 2009
+++ src/distrib/sets/lists/xserver/md.amd64 Tue Jun 23 04:39:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.49 2009/06/18 05:57:34 mrg Exp $
+# $NetBSD: md.amd64,v 1.50 2009/06/23 04:39:52 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -436,8 +436,8 @@
./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/nsc_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/nsc_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/nsc_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/nsc_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/nv_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/nv_drv.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so -unknown- xorg
@@ -470,8 +470,8 @@
./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/vesa_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/vesa_drv.so.2 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/via_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/via_drv.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/vmmouse_drv.so -unknown- xorg
@@ -616,7 +616,7 @@
./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/nsc.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/nsc.0 -unknown- obsolete
./usr/X11R7/man/cat4/nv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/r128.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeon.0 -unknown- .cat,xorg
@@ -629,7 +629,7 @@
./usr/X11R7/man/cat4/trident.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/tseng.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vesa.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/vga.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/vga.0 -unknown- obsolete
./usr/X11R7/man/cat4/via.0 -unknown- obsolete
./usr/X11R7/man/cat4/vmmouse.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vmware.0 -unknown- .cat,xorg
@@ -657,7 +657,7 @@
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg
-./usr/X11R7/man/html4/nsc.html -unknown- html,xorg
+./usr/X11R7/man/html4/nsc.html -unknown- obsolete
./usr/X11R7/man/html4/nv.html -unknown- html,xorg
./usr/X11R7/man/html4/r128.html -unknown- html,xorg
./usr/X11R7/man/html4/radeon.html -unknown- html,xorg
@@ -670,7 +670,7 @@
./usr/X11R7/man/html4/trident.html -unknown- html,xorg
./usr/X11R7/man/html4/tseng.html -unknown- html,xorg
./usr/X11R7/man/html4/vesa.html -unknown- html,xorg
-./usr/X11R7/man/html4/vga.html -unknown- html,xorg
+./usr/X11R7/man/html4/vga.html -unknown- obsolete
./usr/X11R7/man/html4/via.html -unknown- obsolete
./usr/X11R7/man/html4/vmmouse.html -unknown- html,xorg
./usr/X11R7/man/html4/vmware.html -unknown- html,xorg
@@ -698,7 +698,7 @@
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/neomagic.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/nsc.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/nsc.4 -unknown- obsolete
./usr/X11R7/man/man4/nv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/r128.4 -unknown- .man,xorg
./usr/X11R7/man/man4/radeon.4 -unknown- .man,xorg
@@ -711,7 +711,7 @@
./usr/X11R7/man/man4/trident.4 -unknown- .man,xorg
./usr/X11R7/man/man4/tseng.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vesa.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/vga.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/vga.4 -unknown- obsolete
./usr/X11R7/man/man4/via.4 -unknown- obsolete
./usr/X11R7/man/man4/vmmouse.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vmware.4 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.cats
diff -u src/distrib/sets/lists/xserver/md.cats:1.28 src/distrib/sets/lists/xserver/md.cats:1.29
--- src/distrib/sets/lists/xserver/md.cats:1.28 Fri Jun 12 01:55:59 2009
+++ src/distrib/sets/lists/xserver/md.cats Tue Jun 23 04:39:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.28 2009/06/12 01:55:59 mrg Exp $
+# $NetBSD: md.cats,v 1.29 2009/06/23 04:39:52 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -389,8 +389,8 @@
./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/nsc_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/nsc_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/nsc_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/nsc_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/nv_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/nv_drv.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeon_drv.so -unknown- xorg
@@ -415,8 +415,8 @@
./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/vesa_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/vesa_drv.so.2 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/via_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/via_drv.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/vmware_drv.so -unknown- xorg
@@ -572,7 +572,7 @@
./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/nsc.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/nsc.0 -unknown- obsolete
./usr/X11R7/man/cat4/nv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeon.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeonhd.0 -unknown- .cat,xorg
@@ -583,7 +583,7 @@
./usr/X11R7/man/cat4/trident.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/tseng.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vesa.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/vga.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/vga.0 -unknown- obsolete
./usr/X11R7/man/cat4/via.0 -unknown- obsolete
./usr/X11R7/man/cat4/vmware.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
@@ -608,7 +608,7 @@
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg
-./usr/X11R7/man/html4/nsc.html -unknown- html,xorg
+./usr/X11R7/man/html4/nsc.html -unknown- obsolete
./usr/X11R7/man/html4/nv.html -unknown- html,xorg
./usr/X11R7/man/html4/radeon.html -unknown- html,xorg
./usr/X11R7/man/html4/radeonhd.html -unknown- html,xorg
@@ -619,7 +619,7 @@
./usr/X11R7/man/html4/trident.html -unknown- html,xorg
./usr/X11R7/man/html4/tseng.html -unknown- html,xorg
./usr/X11R7/man/html4/vesa.html -unknown- html,xorg
-./usr/X11R7/man/html4/vga.html -unknown- html,xorg
+./usr/X11R7/man/html4/vga.html -unknown- obsolete
./usr/X11R7/man/html4/via.html -unknown- obsolete
./usr/X11R7/man/html4/vmware.html -unknown- html,xorg
./usr/X11R7/man/html4/void.html -unknown- html,xorg
@@ -644,7 +644,7 @@
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/neomagic.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/nsc.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/nsc.4 -unknown- obsolete
./usr/X11R7/man/man4/nv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/radeon.4 -unknown- .man,xorg
./usr/X11R7/man/man4/radeonhd.4 -unknown- .man,xorg
@@ -655,7 +655,7 @@
./usr/X11R7/man/man4/trident.4 -unknown- .man,xorg
./usr/X11R7/man/man4/tseng.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vesa.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/vga.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/vga.4 -unknown- obsolete
./usr/X11R7/man/man4/via.4 -unknown- obsolete
./usr/X11R7/man/man4/vmware.4 -unknown- .man,xorg
./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.66 src/distrib/sets/lists/xserver/md.i386:1.67
--- src/distrib/sets/lists/xserver/md.i386:1.66 Tue Jun 16 00:26:11 2009
+++ src/distrib/sets/lists/xserver/md.i386 Tue Jun 23 04:39:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.66 2009/06/16 00:26:11 mrg Exp $
+# $NetBSD: md.i386,v 1.67 2009/06/23 04:39:52 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -507,8 +507,8 @@
./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/nsc_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/nsc_drv.so.2 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/nsc_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/nsc_drv.so.2 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/nv_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/nv_drv.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/r128_drv.so -unknown- xorg
@@ -541,8 +541,8 @@
./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/vesa_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/vesa_drv.so.2 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/via_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/via_drv.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/vmmouse_drv.so -unknown- xorg
@@ -714,7 +714,7 @@
./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/nsc.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/nsc.0 -unknown- obsolete
./usr/X11R7/man/cat4/nv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/r128.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeon.0 -unknown- .cat,xorg
@@ -727,7 +727,7 @@
./usr/X11R7/man/cat4/trident.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/tseng.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vesa.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/vga.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/vga.0 -unknown- obsolete
./usr/X11R7/man/cat4/via.0 -unknown- obsolete
./usr/X11R7/man/cat4/vmmouse.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vmware.0 -unknown- .cat,xorg
@@ -755,7 +755,7 @@
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg
-./usr/X11R7/man/html4/nsc.html -unknown- html,xorg
+./usr/X11R7/man/html4/nsc.html -unknown- obsolete
./usr/X11R7/man/html4/nv.html -unknown- html,xorg
./usr/X11R7/man/html4/r128.html -unknown- html,xorg
./usr/X11R7/man/html4/radeon.html -unknown- html,xorg
@@ -768,7 +768,7 @@
./usr/X11R7/man/html4/trident.html -unknown- html,xorg
./usr/X11R7/man/html4/tseng.html -unknown- html,xorg
./usr/X11R7/man/html4/vesa.html -unknown- html,xorg
-./usr/X11R7/man/html4/vga.html -unknown- html,xorg
+./usr/X11R7/man/html4/vga.html -unknown- obsolete
./usr/X11R7/man/html4/via.html -unknown- obsolete
./usr/X11R7/man/html4/vmmouse.html -unknown- html,xorg
./usr/X11R7/man/html4/vmware.html -unknown- html,xorg
@@ -796,7 +796,7 @@
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/neomagic.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/nsc.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/nsc.4 -unknown- obsolete
./usr/X11R7/man/man4/nv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/r128.4 -unknown- .man,xorg
./usr/X11R7/man/man4/radeon.4 -unknown- .man,xorg
@@ -809,7 +809,7 @@
./usr/X11R7/man/man4/trident.4 -unknown- .man,xorg
./usr/X11R7/man/man4/tseng.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vesa.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/vga.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/vga.4 -unknown- obsolete
./usr/X11R7/man/man4/via.4 -unknown- obsolete
./usr/X11R7/man/man4/vmmouse.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vmware.4 -unknown- .man,xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.28 src/external/mit/xorg/server/drivers/Makefile:1.29
--- src/external/mit/xorg/server/drivers/Makefile:1.28 Fri Jun 12 01:59:04 2009
+++ src/external/mit/xorg/server/drivers/Makefile Tue Jun 23 04:39:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/06/12 01:59:04 mrg Exp $
+# $NetBSD: Makefile,v 1.29 2009/06/23 04:39:52 mrg Exp $
SUBDIR= \
xf86-input-keyboard \
@@ -79,7 +79,6 @@
xf86-video-tga \
xf86-video-trident \
xf86-video-tseng \
- xf86-video-vga \
xf86-video-wsfb
.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
@@ -108,7 +107,6 @@
xf86-video-mach64 \
xf86-video-mga \
xf86-video-neomagic \
- xf86-video-nsc \
xf86-video-nv \
xf86-video-r128 \
xf86-video-radeon \
@@ -122,12 +120,18 @@
xf86-video-tga \
xf86-video-trident \
xf86-video-tseng \
- xf86-video-vga \
# replace with xf86-video-openchrome
# xf86-video-via
.endif
+# broken with xorg-server 1.6
+# x86
+# xf86-video-nsc \
+# xf86-video-vga \
+# alpha
+# xf86-video-vga \
+
#xf86-video-rendition
.include <bsd.subdir.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.10 Fri Jun 12 01:59:04 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Tue Jun 23 04:39:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/06/12 01:59:04 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2009/06/23 04:39:52 mrg Exp $
.include <bsd.sys.mk> # for HOST_SH
@@ -91,10 +91,7 @@
DRIVERS= mga glint nv tga s3 s3virge sis rendition neomagic \
i740 tdfx savage cirrus vmware tseng trident chips \
apm i128
-.if ${MACHINE_ARCH} != "x86_64"
-DRIVERS+= nsc
-.endif
-DRIVERS+= ati i810 ark cyrix siliconmotion via fbdev vesa vga \
+DRIVERS+= ati i810 ark cyrix siliconmotion via fbdev vesa \
dummy
IDRIVERS= mouse keyboard acecad calcomp citron digitaledge \
