[src/trunk]: src/sys/arch/i386/conf Some cleanup:

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/93275d684e69
branches:  trunk
changeset: 762638:93275d684e69
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Feb 24 17:42:16 2011 +0000

description:
Some cleanup:
- voyagerfb has no business on x86, so throw it out
- add igsfb, unlike the above it exists in real life on PC graphics cards
- remove duplicate genfb and machfb entries
- remove duplicate wsdisplay entries

diffstat:

 sys/arch/i386/conf/ALL |  16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diffs (59 lines):

diff -r 630ba36766e1 -r 93275d684e69 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Thu Feb 24 17:29:48 2011 +0000
+++ b/sys/arch/i386/conf/ALL    Thu Feb 24 17:42:16 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.296 2011/02/24 13:58:39 jruoho Exp $
+# $NetBSD: ALL,v 1.297 2011/02/24 17:42:16 macallan Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "ALL-$Revision: 1.296 $"
+#ident                 "ALL-$Revision: 1.297 $"
 
 maxusers       64              # estimated number of users
 
@@ -562,30 +562,23 @@
 vga0           at isa?
 vga*           at pci? dev ? function ?
 pcdisplay0     at isa?                 # CGA, MDA, EGA, HGA
-genfb*         at pci? dev ? function ? # generic linear framebuffer driver
-machfb*        at pci? dev ? function ? # ATI Mach64 framebuffer driver
-wsdisplay*     at vga? console ?
-wsdisplay*     at pcdisplay? console ?
-wsdisplay*     at wsemuldisplaydev?
-wsdisplay*     at machfb? console ?
 wskbd*         at pckbd? console ?
 wsmouse*       at pms? mux 0
 
 chipsfb*       at pci? dev ? function ?
 genfb*         at pci? dev ? function ?
+igsfb*         at pci? dev ? function ?
 machfb*                at pci? dev ? function ?
 pm2fb*         at pci? dev ? function ?
 r128fb*                at pci? dev ? function ?
 radeonfb*      at pci? dev ? function ?
 unichromefb*   at pci? dev ? function ?  # VIA Unichrome framebuffer console
 voodoofb*      at pci? dev ? function ?
-voyagerfb*     at pci? dev ? function ?
 wcfb*  at pci? dev ? function ?
-wsdisplay*     at unichromefb?
+wsdisplay*     at wsemuldisplaydev?
 
 # XBOX framebuffer console
 xboxfb0        at pci? dev ? function ?
-wsdisplay*     at xboxfb? console ?
 
 # DRI driver
 i915drm*       at drm?         # Intel i915, i945 DRM driver
@@ -1226,7 +1219,6 @@
 
 # USB LCDs and USB-VGA adaptors
 udl*   at uhub? port ?         # DisplayLink DL-1x0/1x5
-wsdisplay* at udl?
 
 # USB Printer
 ulpt*  at uhub? port ? configuration ? interface ?