Initial support for busybox, update of hwsetup and hw configuration data

... git-svn-id: http://svn.openslx.org/svn/openslx/ld4@262 95ad53e4-c205-0410-b2fa-d234c58c8868
author: Dirk von Suchodoletz 2006-06-30 01:27:12 +0200
committer: Dirk von Suchodoletz 2006-06-30 01:27:12 +0200
commit: ac5635ae692d39c7fe837155651049d432c93333 (patch)
tree: c3d34fbbc5f219fb8110d75595628e9e8bcbfbe3 /initrd
parent: bootsplash bugfix (diff)
download: core-ac5635ae692d39c7fe837155651049d432c93333.tar.gz
core-ac5635ae692d39c7fe837155651049d432c93333.tar.xz
core-ac5635ae692d39c7fe837155651049d432c93333.zip
14 files changed, 2474 insertions, 2136 deletions
diff --git a/initrd/distro-specs/suse/functions-10.1 b/initrd/distro-specs/suse/functions-10.1
index 8e085348..e366ae25 100644
--- a/initrd/distro-specs/suse/functions-10.1
+++ b/initrd/distro-specs/suse/functions-10.1
@@ -14,13 +14,13 @@ preinit () {
 # fake the existence of some helper binaries (which are not of any use
 # within initialramfs)
 for i in usb_id scsi_id vol_id edd_id ata_id path_id hwup ifup ; do
-  echo -e "#!/bin/sh\n:" >/sbin/$i
+  echo -e "#!/bin/ash\n:" >/sbin/$i
 done
 mkdir /lib/udev /usr/sbin
 for i in idedma.sh mount.sh rename_netiface create_floppy_devices ; do
-  echo -e "#!/bin/sh\n:" >/lib/udev/$i
+  echo -e "#!/bin/ash\n:" >/lib/udev/$i
 done
-echo -e "#!/bin/sh\n:" >/usr/sbin/alsactl
+echo -e "#!/bin/ash\n:" >/usr/sbin/alsactl
 chmod u+x /sbin/* /lib/udev/* /usr/sbin/*
 }
 
diff --git a/initrd/initrd-stuff/bin/dhcpmkconfig b/initrd/initrd-stuff/bin/dhcpmkconfig
index 394de967..ca9a6412 100755
--- a/initrd/initrd-stuff/bin/dhcpmkconfig
+++ b/initrd/initrd-stuff/bin/dhcpmkconfig
@@ -4,9 +4,9 @@
 #		several dhcp clients. The result is written in unified form
 #		to the /etc/machine-setup file
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
-#				Lars Mueller, 23-06-2006
-#				Oliver Tappe, 23-06-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 29-06-2006
+#               Lars Mueller, 23-06-2006
+#               Oliver Tappe, 23-06-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 
@@ -19,7 +19,7 @@ this is\n# intended, use dhclient instead or get them via tftp (to be \
 enabled\n# via kernel command line)."
 case $0 in
   *dhcpcd*)
-    dhcl="dhcpcd"; echo -e "$infomsg" >>/etc/machine-setup
+    dhcl="dhcpcd"; echo -e "$infomsg" >>/tmp/confviadhcp
     sed -e "s,',\",g;s,IPADDR,clientip,;s,NETMASK,subnet_mask," \
       -e "s,GATEWAY,gateway,;s,BROADCAST,broadcast_address," \
       -e "s,HOSTNAME,host_name,;s,DOMAIN,domain_name," \
@@ -46,5 +46,16 @@ command\n# line)." >>/tmp/confviadhcp
   *pump*)
     dhcl="pump"; echo -e "$infomsg" >>/tmp/confviadhcp
   ;;
+  *udhcpc*)
+    dhcl="udhcpc"; echo -e "$infomsg" >>/tmp/confviadhcp
+    unset infomsg HOME IFS mask lease interface
+    set | sed \
+      -e "s,^P.*,,;s,ntpsrv,ntp_servers,;s,ip,clientip," \
+      -e "s,serverid,serverip,;s,subnet,subnet_mask," \
+      -e "s,router,gateway,;s,hostname,host_name," \
+      -e "s,dns,domain_name_servers,;s,domain,domain_name," \
+      -e "s,broadcast,broadcast_address,;s,dhc.*,,;/^$/d" \
+        >>/tmp/confviadhcp
+  ;;
 esac
 
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index c6fbf5d7..bc087964 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -4,7 +4,7 @@
 #		script for linux diskless clients, using hwconfig from 
 #		knoppix as base tool 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 26-06-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 29-06-2006
 #		Felix Endres
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
@@ -90,6 +90,7 @@ local ServerLayout='\tIdentifier\t"Simple Layout"\n
 local DRI='\tGroup\t\t"video"\n
 \tMode\t\t0666'
 
+# displayvars may overwrite the above settings
 displayvars
 
 if [ -n "$hw_graphic" ] ; then
@@ -395,7 +396,8 @@ fi
 
 # not rather precise ...
 if strinfile "SCSI" /tmp/hwsetup.info ; then
-  strinfile "CDROM" /tmp/hwsetup.info && modprobe -a ${MODPRV} sr_mod sg
+  strinfile "CDROM" /tmp/hwsetup.info && { modprobe ${MODPRV} sr_mod;
+    modprobe ${MODPRV} sg; }
   strinfile "HD" /tmp/hwsetup.info && modprobe ${MODPRV} sd_mod
 fi
 # fixme - psmouse entladen, falls nicht vorhanden
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 5ae2927a..8565281c 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -198,6 +198,7 @@ case $mnt in
   ;;
   mount)
     portmap || { echo "$error_portm"; ret=1; }
+    # fixme: busybox mount uses nfs ...
     mount -n -t nfs -o ro,nolock $nfsroot $dest || ret=1
     killall -9 portmap
   ;;
@@ -241,8 +242,8 @@ fi
 rundhcp ()
 {
 local vci="$1"
-for dhcp in dhclient dhcpcd pump ipconfig none; do
-  test -x /bin/$dhcp && break;
+for dhcp in dhclient dhcpcd pump ipconfig udhcpc none; do
+  test -e /bin/$dhcp && break;
 done
 if [ "$dhcp" = "none" ] ; then
   error "$error_nodhcp" nonfatal
@@ -264,9 +265,10 @@ case $dhcp in
   2>&1 >/dev/null || error "$error_dhclient"
   ;;
   dhcpcd)
+    [ -n $vci ] && vci="-i $vci"
     ln -s /bin/dhcpmkconfig /bin/dhcpcd.exe
-    dhcpcd -L /var/lib/dhcp -c /bin/dhcpcd.exe -T -t 30 eth0 2>&1 >/dev/null \
-     || error "$error_dhcpcd"
+    dhcpcd $vci -L /var/lib/dhcp -c /bin/dhcpcd.exe -T -t 30 eth0 \
+     2>&1 >/dev/null || error "$error_dhcpcd"
   ;;
   pump)
       error "$error_pump"
@@ -279,6 +281,12 @@ way. use dhclient instead or get them via\n# tftp (to be enabled via kernel \
 command line)." >> /etc/machine-setup
       error "$error_ipconf"
   ;;
+  # udhcpc is part of busybox
+  udhcpc)
+    [ -n $vci ] && vci="-V $vci"
+    ln -s /bin/dhcpmkconfig /bin/udhcpc.script
+    udhcpc -b -q $vci -s /bin/udhcpc.script -i eth0
+  ;;
   *)
   ;;
 esac
@@ -733,7 +741,7 @@ done
 #######################################################################
 # dummy functions
 
-#overwrite xorg configuration set by hwautocfg
+# overwrite xorg configuration set by hwautocfg
 displayvars (){
 :
 }
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 2d16d655..cc19feb7 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -2,7 +2,7 @@
 # Description:  main script for new type of initial ramdisk for
 #               linux diskless clients version 4 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 24-06-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 29-06-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 #               (c) 2006 - odlx.org project
@@ -200,7 +200,9 @@ else
   LOGFILE="/dev/null"
 fi
 # load network adaptor modules
-modprobe ${MODPRV} -a ${NWMODULES} || error "$init_errnwad"
+for mod in ${NWMODULES}; do
+  modprobe ${MODPRV} $mod || error "$init_errnwad"
+done
 # set up loopback networking (ipsetup - function defined in /etc/functions)
 ipsetup 127.0.0.1 255.0.0.0 0.0.0.0 127.255.255.255 lo
 # analyze ip information from the kernel command line and put parts
diff --git a/initrd/initrd-stuff/lib/libpci.so.2 b/initrd/initrd-stuff/lib/libpci.so.2
index 52692140..6b9f5fba 100644
--- a/initrd/initrd-stuff/lib/libpci.so.2
+++ b/initrd/initrd-stuff/lib/libpci.so.2
diff --git a/initrd/initrd-stuff/usr/share/hwdata/CardMonitorCombos b/initrd/initrd-stuff/usr/share/hwdata/CardMonitorCombos
deleted file mode 100644
index 59551191..00000000
--- a/initrd/initrd-stuff/usr/share/hwdata/CardMonitorCombos
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# This file contains information about specific card
-# and monitor combinations
-# 
-# PCIID <integer>
-# VENDORID <integer>
-# MONITORID <string>
-# zero or more modelines like this:
-# Modeline "640x480"     31.5   640  680  720  864   480  488  491  521
-# RESOLUTION8 "res1" "res2"
-# RESOLUTION16 "res1" "res2"
-# RESOLUTION32 "res1" "res2"
-
-# Dell Inspiron 3500, 14.1" 1024x768 LCD
-PCIID 0x0005
-VENDORID 0x10c8
-MONITORID Generic Laptop Display Panel 1024x768
-RESOLUTION8 "1024x768" "640x480"
-RESOLUTION16 "1024x768" "640x480"
-RESOLUTION32 "1024x768" "640x480"
-
-# Dell Inspiron 4000, 14.1" TFT display LCD (Samsung LT141X8-L02)
-PCIID 0x4c46
-VENDORID 0x1002
-MONITORID Generic Laptop Display Panel 1024x768
-Modeline "1024x768"   65.000  1024 1048 1065 1344   768  770  776  806
-RESOLUTION8 "1024x768" "800x600" "640x480"
-RESOLUTION16 "1024x768" "800x600" "640x480"
-RESOLUTION32 "1024x768" "800x600" "640x480"
-
-# IBM Thinkpad A20p
-PCIID 0x4c46
-VENDORID 0x1002
-MONITORID IBM Thinkpad 1400x1050
-Modeline "1400x1050" 113.89 1400 1432 1552 1752 1050 1053 1056 1084 -hsync -vsync
-RESOLUTION8 "1400x1050" "1280x1024" "1024x768" "800x600" "640x480"
-RESOLUTION16 "1400x1050" "1280x1024" "1024x768" "800x600" "640x480"
-RESOLUTION32 "1400x1050" "1280x1024" "1024x768" "800x600" "640x480"
-
-# Dell Inspiron 5000e 14.1" and 15" 1024x768 LCD
-PCIID 0x4c46
-VENDORID 0x1002
-MONITORID Generic Laptop Display Panel 1024x768
-RESOLUTION8 "1024x768" "800x600" "640x480"
-RESOLUTION16 "1024x768" "800x600" "640x480"
-RESOLUTION32 "1024x768" "800x600" "640x480"
- 
-# Dell Inspiron 5000e 15" 1400x1050 LCD
-PCIID 0x4c46
-VENDORID 0x1002
-MONITORID Generic Laptop Display Panel 1400x1050
-Modeline "1400x1050" 108.000  1400 1448 1462 1688  1050 1050 1053 1066
-RESOLUTION8 "1400x1050" "1280x1024" "1024x768" "800x600" "640x480"
-RESOLUTION16 "1400x1050" "1280x1024" "1024x768" "800x600" "640x480"
-RESOLUTION32 "1400x1050" "1280x1024" "1024x768" "800x600" "640x480"
-
-# Dell Inspiron 8000 15" 1400x1050 LCD
-PCIID 0x4d46
-VENDORID 0x1002
-MONITORID Generic Laptop Display Panel 1400x1050
-Modeline "1400x1050" 108.000  1400 1448 1462 1688  1050 1050 1053 1066
-RESOLUTION8 "1400x1050" "1280x1024" "1024x768" "800x600" "640x480"
-RESOLUTION16 "1400x1050" "1280x1024" "1024x768" "800x600" "640x480"
-RESOLUTION32 "1400x1050" "1280x1024" "1024x768" "800x600" "640x480"
-
-# Dell Inspiron 5000e 15" 1600x1200 LCD
-PCIID 0x4c46
-VENDORID 0x1002
-MONITORID Generic Laptop Display Panel 1600x1200
-Modeline "1600x1200" 160.000  1600 1664 1688 2160  1200 1200 1203 1250
-RESOLUTION8 "1600x1200" "1400x1050" "1280x1024" "1024x768" "800x600" "640x480"
-RESOLUTION16 "1600x1200" "1400x1050" "1280x1024" "1024x768" "800x600" "640x480"
-RESOLUTION32 "1600x1200" "1400x1050" "1280x1024" "1024x768" "800x600" "640x480" 
diff --git a/initrd/initrd-stuff/usr/share/hwdata/Cards b/initrd/initrd-stuff/usr/share/hwdata/Cards
index 8c060fda..1f3c46a8 100644
--- a/initrd/initrd-stuff/usr/share/hwdata/Cards
+++ b/initrd/initrd-stuff/usr/share/hwdata/Cards
@@ -1,4 +1,4 @@
-# $Revision: 1.176 $
+# $Revision: 1.165 $
 # This is the database of card definitions used by redhat-config-xfree86,
 # Xconfigurator, xf86cfg, anaconda, and many other X configuration programs.
 #
@@ -54,7 +54,7 @@ DRIVER vga
 # VESA driver
 NAME VESA driver (generic)
 CHIPSET VESA VBE 2.0
-DRIVER vesa
+DRIVER nv
 
 ######################################################################
 # Frame Buffer driver
@@ -154,14 +154,11 @@ SEE Chips & Technologies CT65550
 # bugzilla ID's are relevant and should be updated in the future should the
 # bugs get fixed and testing be required:
 # Bug ID's:  63284
-# Update: Aug 3, 2004 <mharris@redhat.com>
-# Warren has indicated the XaaNo options are no longer needed for this
-# hardware, so I've commented them out and updated bug 63284.
 NAME Chips & Technologies CT69000
 CHIPSET ct69000
-LINE #Option "XaaNoPixmapCache"
-LINE #Option "XaaNoScreenToScreenCopy"
-LINE #Option "XaaNoCPUToScreenColorExpandFill"
+LINE Option "XaaNoPixmapCache"
+LINE Option "XaaNoScreenToScreenCopy"
+LINE Option "XaaNoCPUToScreenColorExpandFill"
 LINE #Option "NoAccel"
 SEE Chips & Technologies CT65550
 
@@ -856,7 +853,7 @@ SEE S3 Trio64V+ (generic)
 NAME S3 Trio64V2 (generic)
 CHIPSET S3 Trio64V2
 #DRIVER s3
-DRIVER vesa
+DRIVER nv
 NOCLOCKPROBE
 #UNSUPPORTED
 
@@ -866,7 +863,7 @@ NOCLOCKPROBE
 NAME S3 Trio64V2 (Unsupported RAMDAC)
 CHIPSET s3virge
 #DRIVER s3
-DRIVER vesa
+DRIVER nv
 NOCLOCKPROBE
 
 NAME S3 Trio64V2/DX (generic)
@@ -1019,12 +1016,12 @@ SEE S3 968 (generic)
 NAME Spider Tarantula 64
 SEE S3 964 (generic)
 
-# Changed "DRIVER s3" to "DRIVER vesa" for bug #70743.  Be sure to confirm
+# Changed "DRIVER s3" to "DRIVER nv" for bug #70743.  Be sure to confirm
 # any changes to this with the reporter of that bug.  Aug 10, 2002 - mharris
 NAME Miro Crystal 20SV
 CHIPSET S3 964
 SERVER S3
-DRIVER vesa
+DRIVER nv
 CLOCKCHIP icd2061a
 #UNSUPPORTED
 
@@ -1243,6 +1240,7 @@ LINE      #Option "pci_retry"
 
 NAME S3 ViRGE/GX (generic)
 CHIPSET S3 ViRGE/GX
+SERVER SVGA
 DRIVER s3virge
 NOCLOCKPROBE
 LINE      #Option "xaa_benchmark"
@@ -1253,6 +1251,7 @@ LINE      #Option "pci_retry"
 
 NAME S3 ViRGE/GX2 (generic)
 CHIPSET S3 ViRGE/GX2
+SERVER SVGA
 DRIVER s3virge
 NOCLOCKPROBE
 LINE      #Option "xaa_benchmark"
@@ -1263,6 +1262,7 @@ LINE      #Option "pci_retry"
 
 NAME S3 ViRGE/MX (generic)
 CHIPSET S3 ViRGE/MX
+SERVER SVGA
 DRIVER s3virge
 NOCLOCKPROBE
 LINE      #Option "lcd_center"
@@ -1280,29 +1280,11 @@ SEE S3 ViRGE/MX (generic)
 # bug #59956 in bugzilla.  The bug reporter of the above report should be
 # consulted before changing this back to a native driver in the future.  This
 # is changed for 4.2.0 post RHL 7.3.  --  July 26, 2002 - Mike A. Harris
-# Update:  Bug #125866 has requested the driver for this hardware be changed
-# to use the "s3virge" driver.  I've investigated the original bug #59956 and
-# the PCI IDs are identical for all 3 users in those 2 bug reports, so I
-# assume the "s3virge" driver works now in X.Org X11 6.7.99.903 et al.  I'm
-# changing the default back from "vesa" to "s3virge" for the "S3 Trio3D" entry
-# here, but I've added a new one named "S3 Trio64 3D" as well, which also
-# defaults to the "s3virge" driver.  I've left the pcitable->Cards mapping
-# alone for the 0x8904 and 0x8903 entries so that they can be changed in the
-# future if a problem is discovered, however the new entry added to pcitable
-# is for the specific card referenced in these above bug reports, specified
-# including the subvendor/subdevice fields, so that we can assign drivers for
-# these card ranges in a more finely grained manner.
 NAME S3 Trio3D
+SERVER SVGA
 CHIPSET S3 Trio3D
 NOCLOCKPROBE
-DRIVER s3virge
-# See above comment for "S3 Trio3D" as it applies to this one as well.
-# This "S3 Trio64 3D" entry is specifically for:
-#	01:01.0 Class 0300: 5333:8904 (rev 01) Subsystem: 1014:00db
-NAME S3 Trio64 3D
-CHIPSET S3 Trio3D
-NOCLOCKPROBE
-DRIVER s3virge
+DRIVER nv
 
 NAME S3 86C365 (Trio3D)
 SEE S3 Trio3D
@@ -1550,13 +1532,13 @@ NOCLOCKPROBE
 NAME S3 Savage/MX
 CHIPSET Savage/MX
 DRIVER savage
-#DRIVER vesa
+#DRIVER nv
 NOCLOCKPROBE
 
 NAME S3 Savage/IX
 CHIPSET Savage/IX
 DRIVER savage
-#DRIVER vesa
+#DRIVER nv
 NOCLOCKPROBE
 
 NAME S3 ProSavage KM133
@@ -1579,13 +1561,6 @@ CHIPSET ProSavage/Twister
 DRIVER savage
 NOCLOCKPROBE
 
-# S3 UniChrome (via)
-
-NAME S3 UniChrome
-CHIPSET UniChrome
-DRIVER via
-NOCLOCKPROBE
-
 # Tseng Labs ET4000/ET6000
 
 NAME ET3000 (generic)
@@ -2076,11 +2051,6 @@ CHIPSET R300
 DRIVER radeon
 LINE #Option "nodri"
 
-NAME ATI Radeon Mobility 9600 M10
-CHIPSET RV350
-DRIVER radeon
-LINE #Option "nodri"
-
 NAME ATI Radeon 9700
 CHIPSET R300
 DRIVER radeon
@@ -2101,11 +2071,6 @@ CHIPSET R350
 DRIVER radeon
 LINE #Option "nodri"
 
-NAME ATI Radeon 9800 XT
-CHIPSET R350
-DRIVER radeon
-LINE #Option "nodri"
-
 NAME ATI FireGL Z1/X1
 CHIPSET R300
 DRIVER radeon
@@ -2116,118 +2081,19 @@ CHIPSET R300
 DRIVER radeon
 LINE #Option "nodri"
 
-NAME ATI FireGL X2
-CHIPSET RV350
-DRIVER radeon
-LINE #Option "nodri"
-
 NAME ATI FireGL Z1
 CHIPSET R300
 DRIVER radeon
 LINE #Option "nodri"
 
-NAME ATI FireGL T2
-CHIPSET RV350
-DRIVER radeon
-
-NAME ATI FireGL Mobility T2
-CHIPSET RV350
-DRIVER radeon
-
+# No idea if this works or not.  I'm adding it here pointing to the vesa driver
+# for now (mharris Feb 10, 2002 - XFree86 4.2.99.901)
 NAME ATI Radeon Mobility U1
 CHIPSET R300
 DRIVER radeon
 LINE #Option "nodri"
 
-NAME ATI FireGL D1100
-DRIVER radeon
-
-NAME ATI FireGL M22 GL
-DRIVER radeon
-
-NAME ATI FireGL M24 GL
-DRIVER radeon
-
-NAME ATI FireGL Mobility T2e
-DRIVER radeon
-
-NAME ATI FireGL V3100
-DRIVER radeon
-
-NAME ATI FireGL V3200
-DRIVER radeon
-
-NAME ATI FireGL V5100
-DRIVER radeon
-
-NAME ATI FireGL V7100
-DRIVER radeon
 
-NAME ATI FireGL V7200
-DRIVER radeon
-
-NAME ATI FireGL X3
-DRIVER radeon
-
-NAME ATI Radeon 7000 IGP
-DRIVER radeon
-
-NAME ATI Radeon 9100 IGP
-DRIVER radeon
-
-NAME ATI Radeon 9100 PRO IGP
-DRIVER radeon
-
-NAME ATI Radeon 9200PRO
-DRIVER radeon
-
-NAME ATI Radeon IGP320
-DRIVER radeon
-
-NAME ATI Radeon IGP330/340/350
-DRIVER radeon
-
-NAME ATI Radeon IGP330M/340M/350M
-DRIVER radeon
-
-NAME ATI Radeon Mobility 7000
-DRIVER radeon
-
-NAME ATI Radeon Mobility 9100 IGP
-DRIVER radeon
-
-NAME ATI Radeon Mobility 9200
-DRIVER radeon
-
-NAME ATI Radeon Mobility 9200 IGP
-DRIVER radeon
-
-NAME ATI Radeon Mobility 9800
-DRIVER radeon
-
-NAME ATI Radeon Mobility M300
-DRIVER radeon
-
-NAME ATI Radeon Mobility X600
-DRIVER radeon
-
-NAME ATI Radeon X800LE
-DRIVER radeon
-
-NAME ATI Radeon X800PRO
-DRIVER radeon
-
-NAME ATI Radeon X800SE
-DRIVER radeon
-
-NAME ATI Radeon X300
-DRIVER radeon
-
-NAME ATI Radeon X600
-DRIVER radeon
-
-NAME ATI Radeon X800XT
-DRIVER radeon
 
 ######################################################################
 NAME ATI Rage Fury Pro AGP
@@ -2794,6 +2660,8 @@ NOCLOCKPROBE
 # tested #UNSUPPORTED by 12XL125 compaq laptop 03/30/2001
 NAME Trident CyberBlade (generic)
 CHIPSET CyberBlade
+SERVER SVGA
+#UNSUPPORTED
 DRIVER trident
 NOCLOCKPROBE
 
@@ -2925,7 +2793,24 @@ LINE     # Option "fifo_conserv"
 LINE     # Option "fifo_aggressive" 
 NOCLOCKPROBE
 
-NAME SiS 5597/5598
+NAME SiS 5597
+CHIPSET SiS5597
+SERVER SVGA
+DRIVER sis
+LINE     # Option "no_accel" # Use this if acceleration is causing problems
+LINE     # Option "fifo_moderate" 
+LINE     # Option "fifo_conserv" 
+LINE     # Option "fifo_aggressive" 
+LINE     # Option "fast_vram"
+LINE     # Option "pci_burst_on"
+LINE     # Option "xaa_benchmark" # DON'T use with "ext_eng_queue" !!!
+LINE     # Option "ext_eng_queue" # Turbo-queue. This can cause drawing
+LINE                              # errors, but gives some accel
+NOCLOCKPROBE
+
+NAME SiS 5598
+CHIPSET SIS5598
+SERVER SVGA
 DRIVER sis
 LINE     # Option "no_accel" # Use this if acceleration is causing problems
 LINE     # Option "fifo_moderate" 
@@ -2965,7 +2850,7 @@ NOCLOCKPROBE
 # mharris - Nov 23, 2002 - Commented out the swcursor option, if it is still
 # needed, then lets disable it right in the driver completely, or possibly
 # fix it.
-NAME SiS 530/620
+NAME SiS 530
 CHIPSET SiS530
 DRIVER sis
 LINE    #Option "swcursor"
@@ -2979,12 +2864,12 @@ CHIPSET SiS540
 DRIVER sis
 NOCLOCKPROBE
 
-NAME SiS 630/730
+NAME SiS 630
 CHIPSET SiS630
 DRIVER sis
 NOCLOCKPROBE
 
-NAME SiS 650/M650/651/740
+NAME SiS 650
 CHIPSET SiS650
 DRIVER sis
 NOCLOCKPROBE
@@ -2994,39 +2879,9 @@ CHIPSET SiS300
 DRIVER sis
 NOCLOCKPROBE
 
-NAME SiS 300/305
-DRIVER sis
-NOCLOCKPROBE
-
 NAME SiS 315
 CHIPSET SiS315
 DRIVER sis
-NOCLOCKPROBE
-
-NAME SiS 315H
-CHIPSET SiS315H
-DRIVER sis
-NOCLOCKPROBE
-
-NAME SiS 315Pro
-DRIVER sis
-NOCLOCKPROBE
-
-NAME SiS 330 Xabre
-DRIVER sis
-NOCLOCKPROBE
-
-NAME SiS 340
-DRIVER sis
-NOCLOCKPROBE
-
-NAME SiS 550
-DRIVER sis
-NOCLOCKPROBE
-
-NAME SiS 660/661FX/M661FX/M661MX/741/741GX/M741/760/M760
-DRIVER sis
-NOCLOCKPROBE
 
 NAME MSI MS-4417
 SEE SiS 6326
@@ -3368,81 +3223,6 @@ CHIPSET Quadro FX
 DRIVER nv
 NOCLOCKPROBE
 
-NAME NVIDIA GeForce 6200
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce 6600
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce 6600 GT
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce 6610 XL
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce 6800
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce 6800 GT
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce 6800 LE
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce 6800 Ultra
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce FX 5100
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce FX 5500
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce Go 6600
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce Go 6600 TE/6200 TE
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA GeForce4 448 Go
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA Quadro FX 4000
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA Quadro FX 4400
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA Quadro FX 540
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA Quadro FX 700
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA Quadro NVS 50 PCI
-DRIVER nv
-NOCLOCKPROBE
-
-NAME NVIDIA Unknown (generic)
-DRIVER nv
-
 #########################################################################
 #
 # 3DLabs
@@ -3831,7 +3611,7 @@ RAMDAC Bt463
 
 NAME EPSON CardPC (onboard)
 CHIPSET SPC8110
-DRIVER vesa
+DRIVER nv
 
 
 ######################################################################
@@ -4004,30 +3784,14 @@ CHIPSET Intel 865
 DRIVER i810
 NOCLOCKPROBE
 
-NAME Intel 915
-DRIVER i810
-NOCLOCKPROBE
-
 ######################################################################
 # 3Dfx Hardware
 #
 # Section fully updated by Mike A. Harris <mharris@redhat.com> for
 # XFree86 4.2.0 on Feb 9, 2002
 
-# Alan Cox's new "voodoo" driver for Voodoo Graphics and Voodoo II
-#0x121a  0x0001  "Card:Voodoo Graphics"  "3Dfx Interactive, Inc.|Voodoo"
-NAME Voodoo Graphics
-CHIPSET Voodoo Graphics
-DRIVER voodoo
-
-# Alan Cox's new "voodoo" driver for Voodoo Graphics and Voodoo II
-#0x121a  0x0002  "Card:Voodoo II"    "3Dfx Interactive, Inc.|Voodoo 2"
-NAME Voodoo II
-CHIPSET Voodoo II
-DRIVER voodoo
-
-NAME Banshee (generic)
-CHIPSET Banshee
+NAME Voodoo Banshee (generic)
+CHIPSET Voodoo Banshee
 DRIVER tdfx
 
 NAME Voodoo Rush (generic)
@@ -4050,16 +3814,16 @@ DRIVER tdfx
 NOCLOCKPROBE
 
 NAME Elsa Victory II
-SEE Banshee (generic)
+SEE Voodoo Banshee (generic)
 
 NAME Diamond Monster Fusion
-SEE Banshee (generic)
+SEE Voodoo Banshee (generic)
 
 NAME AOpen PA2010
-SEE Banshee (generic)
+SEE Voodoo Banshee (generic)
 
 NAME Chaintech Desperado 3F10
-SEE Banshee (generic)
+SEE Voodoo Banshee (generic)
 
 ######################################################################
 # VMWare Virtual Hardware
diff --git a/initrd/initrd-stuff/usr/share/hwdata/MonitorsDB b/initrd/initrd-stuff/usr/share/hwdata/MonitorsDB
index beae5710..b3554004 100644
--- a/initrd/initrd-stuff/usr/share/hwdata/MonitorsDB
+++ b/initrd/initrd-stuff/usr/share/hwdata/MonitorsDB
@@ -58,6 +58,38 @@ Acer; Acer 7156s; api5338; 31.0-70.0; 55.0-90.0; 1
 Acer; Acer 7176ie; api454c; 31.0-70.0; 55.0-90.0; 1
 Acer; Acer 7176is; api534c; 31.0-70.0; 55.0-90.0; 1
 Acer; Acer 7178ie; api454e; 31.0-90.0; 55.0-90.0; 1
+Acer; Acer AL501; ABO5580; 24.0-60.0; 56.0-75.0
+Acer; Acer AC501; ABO5572; 30.0-70.0; 50.0-120.0
+Acer; Acer AL502; ACR1602; 30.0-60.0; 55.0-75.0
+Acer; Acer AL506; ACRAD03; 24.0-61.0; 54.0-76.0
+Acer; Acer AC511; ACRAC02; 30.0-54.0; 50.0-120.0
+Acer; Acer AL511; ABO5581; 24.0-60.0; 56.0-75.0
+Acer; Acer AC701; ABO7086; 30.0-70.0; 50.0-160.0
+Acer; Acer AL702; ACR7204; 31.5.0-81.0; 56.3.0-75.0
+Acer; Acer AF705; ABO7084; 30.0-70.0; 50.0-120.0
+Acer; Acer AC711; ABO7087; 30.0-70.0; 50.0-160.0
+Acer; Acer AC713; ACRAC04; 30.0-72.0; 50.0-160.0
+Acer; Acer AF715; ACRAC05; 30.0-98.0; 50.0-160.0
+Acer; Acer AC901; ACR1902; 30.0-96.0; 50.0-160.0
+Acer; Acer AL1511; ACRAD14; 30.0-63.0; 55.0-75.0
+Acer; Acer AL1512; AL1512; 28.0-63.0; 55.0-78.0
+Acer; Acer AL1521; ACRAD05; 30.0-63.0; 55.0-75.0
+Acer; Acer AL1702; ACRAD31; 30.0-82.0; 56.0-76.0
+Acer; Acer AL1703; ACRAD34; 30.0-82.0; 50.0-75.0
+Acer; Acer AL1711; ACRAD12; 30.0-83.0; 55.0-75.0
+Acer; Acer AL1713; ACRAD17; 30.0-80.0; 56.0-75.0
+Acer; Acer AL1714; ACRAD18; 30.0-82.0; 50.0-75.0
+Acer; Acer AL1715; ACR5770; 24.0-80.0; 49.0-75.0
+Acer; Acer AL1721; ACRAD04; 30.0-83.0; 55.0-75.0
+Acer; Acer AL1731 (Analog); ACRAD06; 30.0-80.0; 56.0-75.0
+Acer; Acer AL1731 (Digital); ACRAE06; 30.0-64.0; 56.0-75.0
+Acer; Acer AL1732; ACR06C4; 30.0-83.0; 50.0-75.0
+Acer; Acer AL1911; ACRAD10; 24.0-80.0; 56.0-75.0
+Acer; Acer AL1912; ACR5990; 24.0-80.0; 49.0-75.0
+Acer; Acer AL1913; ACRAD36; 30.0-82.0; 56.0-76.0
+Acer; Acer AL1914; ACRAD29; 30.0-83.0; 55.0-75.0
+Acer; Acer AL1931; ACRAD07; 24.0-80.0; 56.0-75.0
+Acer; Acer AL2032W; ACR07F0; 30.0-83.0; 50.0-75.0
 Acer; Acer 1768i; api424c; 30.0-69.0; 50.0-110.0; 1
 Acer; Acer 76c; API9706; 30.0-72.0; 50.0-120.0
 Acer; Acer 76e; API9702; 30.0-72.0; 50.0-110.0
@@ -175,7 +207,7 @@ ADI; ADI MicroScan 3V; adi0638; 24.6-48.9; 50.0-100.0; 1
 ADI; ADI MicroScan 3V; adi0640; 24.6-48.9; 50.0-100.0; 1
 ADI; ADI MicroScan 4A; sm-5515; 30.0-58.0; 50.0-100.0; 1
 ADI; ADI MicroScan 4G; adi4g; 30.0-64.0; 50.0-100.0; 1
-ADI; ADI MicroScan 4GP; adi4gp; 30-64; 50-100; 1
+ADI; ADI MicroScan 4GP; adi4gp; 30.0-64.0; 50.0-100.0; 1
 ADI; ADI MicroScan 4P/4P+; adi1630; 30.0-69.0; 50.0-100.0; 1
 ADI; ADI MicroScan 4P/4P+; adi1632; 30.0-69.0; 50.0-100.0; 1
 ADI; ADI MicroScan 4P/4P+; adi1633; 30.0-69.0; 50.0-100.0; 1
@@ -208,7 +240,7 @@ ADI; ADI MicroScan 4V; adi0740; 30-64; 50-100; 1
 ADI; ADI MicroScan 4V; adi0750; 30-64; 50-100; 1
 ADI; ADI MicroScan 4V; adi0755; 30-64; 50-100; 1
 ADI; ADI MicroScan 4V; adi0940; 30-64; 50-100; 1
-ADI; ADI MicroScan 4V; adi4v; 30-64; 50-95; 1
+ADI; ADI MicroScan 4V; adi4v; 30.0-64.0; 50.0-95.0; 1
 ADI; ADI MicroScan 5AP; adi5ap; 30-64; 50-100; 1
 ADI; ADI MicroScan 5EP; adi5ep; 30-64; 50-100; 1
 ADI; ADI MicroScan 5G; adi1550; 30.0-95.0; 50.0-120.0; 1
@@ -220,6 +252,7 @@ ADI; ADI MicroScan 5G; adi1556; 30.0-95.0; 50.0-120.0; 1
 ADI; ADI MicroScan 5G; adi1572; 30.0-95.0; 50.0-120.0; 1
 ADI; ADI MicroScan 5G; adi1c50; 30.0-95.0; 50.0-120.0; 1
 ADI; ADI MicroScan 5G; adi1c52; 30.0-95.0; 50.0-120.0; 1
+ADI; ADI MicroScan 5GT; adi1530; 30.0-94.0; 50.0-160.0; 1
 ADI; ADI MicroScan 5L; adi3e50; 30.0-56.0; 50.0-100.0; 1
 ADI; ADI MicroScan 5L; adi3f50; 30.0-56.0; 50.0-100.0; 1
 ADI; ADI MicroScan 5P/5P+; adi1730; 30.0-69.0; 50.0-100.0; 1
@@ -248,6 +281,7 @@ ADI; ADI MicroScan 5P/5P+; adi2481; 30.0-69.0; 50.0-100.0; 1
 ADI; ADI MicroScan 5P/5P+; adi2630; 30.0-69.0; 50.0-100.0; 1
 ADI; ADI MicroScan 5P/5P+; adi2640; 30.0-69.0; 50.0-100.0; 1
 ADI; ADI MicroScan 5P/5P+; adi2650; 30.0-69.0; 50.0-100.0; 1
+ADI; ADI MicroScan 5PD; adi3430; 30.0-86.0; 50.0-160.0; 1
 ADI; ADI MicroScan 5T; adi3650; 30.0-56.0; 50.0-100.0; 1
 ADI; ADI MicroScan 5T; adi3750; 30.0-56.0; 50.0-100.0; 1
 ADI; ADI MicroScan 5V; adi0b30; 30.0-64.0; 50.0-100.0; 1
@@ -278,6 +312,8 @@ ADI; ADI MicroScan 6P; adi20b2; 30.0-95.0; 50.0-120.0; 1
 ADI; ADI MicroScan 6P; adi20b3; 30.0-95.0; 50.0-120.0; 1
 ADI; ADI MicroScan 6P; adi20b4; 30.0-95.0; 50.0-120.0; 1
 ADI; ADI MicroScan 6P; adi20b5; 30.0-95.0; 50.0-120.0; 1
+ADI; ADI MicroScan 6T+; adi7850; 31.0-61.0; 56.0-75.0; 1
+ADI; ADI MicroScan 9L; adi4E50; 31.0-91.0; 56.0-85.0; 1
 ADI; ADI MicroScan G55; adi3630; 30.0-86.0; 50.0-120.0; 1
 ADI; ADI MicroScan G56; adi3730; 30.0-95.0; 50.0-120.0; 1
 ADI; ADI MicroScan G60; adi3930; 30.0-86.0; 50.0-120.0; 1
@@ -286,6 +322,7 @@ ADI; ADI MicroScan G70; adi3830; 30.0-110.0; 50.0-120.0; 1
 ADI; ADI MicroScan P40; adi2c30; 30.0-69.0; 50.0-100.0; 1
 ADI; ADI MicroScan P50; adi3330; 30.0-69.0; 50.0-100.0; 1
 ADI; ADI MicroScan P55; adi3430; 30.0-82.0; 50.0-120.0; 1
+ADI; ADI ProVista 5PM; adi3530; 30.0-69.0; 50.0-160.0; 1
 ADI; ADI ProVista 14; adi1350; 30.6-48.0; 50.0-100.0; 1
 ADI; ADI ProVista E30; adi1830; 30.0-54.0; 50.0-100.0; 1
 ADI; ADI ProVista E30; adi1832; 30.0-54.0; 50.0-100.0; 1
@@ -316,8 +353,34 @@ ADI; ADI ProVista E40; adi1944; 30.0-64.0; 50.0-100.0; 1
 ADI; ADI ProVista E40; adi1950; 30.0-64.0; 50.0-100.0; 1
 ADI; ADI ProVista E40; adi1952; 30.0-64.0; 50.0-100.0; 1
 ADI; ADI ProVista E44; adi2e30; 30.0-69.0; 50.0-100.0; 1
+ADI; ADI ProVista E44+; adi7650; 30.0-70.0; 50.0-160.0; 1
 ADI; ADI ProVista E55; adi4430; 30.0-69.0; 50.0-100.0; 1
 ADI; ADI ProVista E66; adi3e30; 30.0-86.0; 50.0-120.0; 1
+ADI; ADI TM-34; adi5F10; 31.0-38.0; 50.0-120.0; 1
+ADI; ADI TM-29; adi8110; 31.0-50.0; 50.0-120.0; 1
+ADI; ADI MicroScan A600; adi5D10; 31.0-61.0; 56.0-75.0; 1
+ADI; ADI MicroScan A610; adi6450; 31.0-61.0; 56.0-75.0; 1
+ADI; ADI MicroScan E50; adi2E30; 30.0-70.0; 50.0-120.0; 1
+ADI; ADI MicroScan E66; adi8930; 30.0-96.0; 50.0-160.0; 1
+ADI; ADI MicroScan E66; adi3E30; 30.0-96.0; 50.0-155.0; 1
+ADI; ADI MicroScan E75; adi5230; 30.0-86.0; 50.0-160.0; 1
+ADI; ADI MicroScan F520; adi9830; 30.0-70.0; 50.0-160.0; 1
+ADI; ADI MicroScan F720; adi9530; 30.0-70.0; 50.0-160.0; 1
+ADI; ADI MicroScan F730; adi9630; 30.0-70.0; 50.0-160.0; 1
+ADI; ADI MicroScan GT56; adi3730; 30.0-94.0; 50.0-160.0; 1
+ADI; ADI MicroScan G500; adi5130; 30.0-70.0; 50.0-120.0; 1
+ADI; ADI MicroScan G700; adi7550; 30.0-86.0; 50.0-160.0; 1
+ADI; ADI MicroScan G700i; adi9750; 30.0-86.0; 50.0-160.0; 1
+ADI; ADI MicroScan G710; adi5450; 30.0-96.0; 50.0-160.0; 1
+ADI; ADI MicroScan G900; adi3E50; 30.0-96.0; 50.0-160.0; 1
+ADI; ADI MicroScan G910; adi5750; 30.0-110.0; 50.0-160.0; 1
+ADI; ADI MicroScan G1000; adi5850; 30.0-121.0; 50.0-160.0; 1
+ADI; ADI MicroScan I600; adi8350; 31.0-61.0; 56.0-75.0; 1
+ADI; ADI MicroScan I610; adiA950; 31.0-61.0; 56.0-75.0; 1
+ADI; ADI MicroScan I612; adi8450; 31.0-61.0; 56.0-75.0; 1
+ADI; ADI MicroScan M500; adi8630; 30.0-54.0; 50.0-160.0; 1
+ADI; ADI MicroScan M510; adi8730; 30.0-70.0; 50.0-160.0; 1
+ADI; ADI MicroScan M700; adi8830; 30.0-70.0; 50.0-160.0; 1
 Amptron International,Inc.; Amptron CS19; AMPCS19; 30.0-95.0; 50.0-120.0
 Amptron International,Inc.; Amptron AV8S; AMPAV8S; 30.0-68.0; 50.0-110.0
 Amptron International,Inc.; Amptron ES15; AMPD556; 30.0-54.0; 50.0-120.0
@@ -386,10 +449,10 @@ Apple; Apple Multiple Scan 720; 0; 30-69; 48-160
 Apple; Apple Performa Display; 0; 35.0 ; 66.7
 Apple; Apple Studio Display 17 CRT; 0; 30-85; 48-160
 Apple; Apple Studio Display 21 CRT; 0; 31-107; 48-120
-Apple; Apple Vision 1710; 0; 30-80; 40-120
+Apple; Apple Vision 1710; APP1017; 30-80; 40-120
 Apple; Apple Vision 1710AV; 0; 30-82; 50-120
 Apple; Apple Vision 750AV; 0; 30-82; 40-120
-Apple; Apple Vision 850 AV; 0; 30-94; 48-120
+Apple; Apple Vision 850 AV; APP0352; 30-94; 48-120
 AST; AST Sabre; ast8009; 30.0-64.0; 50.0-90.0; 1
 AST; AST Vision 20H; ast8008; 29.0-82.0; 50.0-150.0; 1
 AST; AST Vision 4I; ast8002; 30.0-38.0; 50.0-90.0; 1
@@ -437,6 +500,7 @@ BenQ; BenQ FP791; BNQ7640; 31.5-83.0; 60.0-76.0; 1
 BenQ; BenQ FP882 (Analog); BNQ7633; 31.5-83.0; 56.0-76.0; 1
 BenQ; BenQ FP882 (Digital); BNQ763D; 31.5-71.0; 56.0-76.0; 1
 BenQ; BenQ FP937s; BNQ7685; 31-83.0; 56.0-76.0; 1
+BenQ; BenQ FP951; BNQ7666; 31.0-83.0; 56.0-76.0; 1
 BenQ; BenQ FP991; BNQ7646; 31.0-83.0; 56.0-76.0; 1
 BenQ; BenQ FP992; BNQ7276; 31.0-83.0; 56.0-76.0; 1
 BenQ; BenQ P992; BNQ0106; 30.0-98.0; 50.0-160.0; 1
@@ -870,12 +934,13 @@ Daytek; Daytek TM-1554D; oec0504; 30.0-54.0; 50.0-120.0; 1
 Daytek; Daytek TM-1569D; oec020f; 30.0-70.0; 50.0-120.0; 1
 Daytek; Daytek TM-1769D; oec0211; 30.0-70.0; 50.0-120.0; 1
 Daytek; Daytek TM-1770D; oec0707; 30.0-70.0; 50.0-120.0; 1
+Daytek; Daytek 755DF; oec7704; 30.0-70.0; 50.0-150.0; 1
 Dell; Dell 1024i; 0; 35.5; 87.0; 1
 Dell; Dell 1024i-P/1024i-Color; 0; 35.5; 87.0; 1
-Dell; Dell 1024x768 Laptop Display Panel; 0; 31.5-48.5; 59.0-75.0; 1
+Dell; Dell 1024x768 Laptop Display Panel; QDS005; 31.5-48.5; 59.0-75.0; 1
 Dell; Dell 1280x1024 Laptop Display Panel; 0; 31.5-90.0; 59.0-75.0; 1
 Dell; Dell 1400FP; del8162; 31.0-60.0; 55.0-86.0; 1
-Dell; Dell 1400x1050 Laptop Display Panel; 0; 31.5-90.0; 59.0-75.0; 1
+Dell; Dell 1400x1050 Laptop Display Panel; SEC3450; 31.5-90.0; 59.0-75.0; 1
 Dell; Dell 1401FP; delc0ec; 31.0-80.0; 56.0-76.0; 1
 Dell; Dell 1500FP; del715d; 30.0-61.0; 56.0-75.0; 1
 Dell; Dell 1501FP (Analog); del73a4; 30.0-61.0; 56.0-75.0; 1
@@ -917,6 +982,8 @@ Dell; Dell 2001FP (Analog); DELA007; 31.0-80.0; 56.0-76.0; 1
 Dell; Dell 2001FP (Digital); DELA008; 31.0-80.0; 56.0-76.0; 1
 Dell; Dell 2005FPW (Analog); DELE008; 30.0-83.0; 56.0-75.0; 1
 Dell; Dell 2005FPW (Digital); DELE009; 30.0-83.0; 56.0-75.0; 1
+Dell; Dell 2405FPW (Analog); DELA00F; 30.0-83.0; 56.0-76.0
+Dell; Dell 2405FPW (Digital); DELA010; 30.0-83.0; 56.0-76.0
 Dell; Dell 800M; del5697; 30.0-70.0; 50.0-130.0; 1
 Dell; Dell 828FI; del3319; 30.0-70.0; 50.0-120.0; 1
 Dell; Dell D1025HE; del6124; 31.5-92.0; 50.0-150.0; 1
@@ -1307,36 +1374,110 @@ Gateway; Gateway DL36-1; gwy0e11; 31.0-38.0; 50-75; 1
 Gateway; Gateway EV500; gwy138a; 31-69; 50-110; 1
 Gateway; Gateway EV500; gwy138b; 31-69; 50-110; 1
 Gateway; Gateway EV500; gwy138c; 31-69; 50-110; 1
+Gateway; Gateway EV500B; gwy1390; 30.0-70.0; 50.0-160.0; 1
 Gateway; Gateway EV500; gwy5005; 31-69; 50-110; 1
-Gateway; Gateway EV575; gwy15c7; 31.0-60.0; 50.0-110.0+; 1
+Gateway; Gateway EV500; gwy1393; 30.0-70.0; 50.0-120.0; 1
+Gateway; Gateway EV530; gwy1394; 30.0-56.0; 50.0-120.0; 1
+Gateway; Gateway EV575; gwy15c7; 31.0-60.0; 50.0-110.0; 1
 Gateway; Gateway EV700; gwy1b5a; 31-69; 50-110; 1
 Gateway; Gateway EV700; gwy1b5b; 31-69; 50-110; 1
 Gateway; Gateway EV700; gwy1b5c; 31-69; 50-110; 1
 Gateway; Gateway EV700; gwy1b5d; 31-69; 50-110; 1
 Gateway; Gateway EV700; gwy1b5e; 31-69; 50-110; 1
 Gateway; Gateway EV700; gwy1b5f; 31-69; 50-110; 1
-Gateway; Gateway EV700; GWY1B62; 30.0-70.0; 50.0-160.0
+Gateway; Gateway EV700; gwy1B62; 30.0-70.0; 50.0-160.0; 1
+Gateway; Gateway EV700; gwy1B67; 30.0-69.0; 50.0-120.0; 1
 Gateway; Gateway EV700; gwy7658; 30.0-70.0; 50.0-120.0; 1
+Gateway; Gateway EV700B; gwy1B64; 30.0-70.0; 50.0-160.0; 1
 Gateway; Gateway EV700-H; gwy7659; 30.0-70.0; 50.0-120.0; 1
+Gateway; Gateway EV700C; gwy1B66; 30.0-70.0; 50.0-160.0; 1
+Gateway; Gateway EV730; gwy1B69; 30.0-69.0; 50.0-120.0; 1
+Gateway; Gateway EV730; gwy1B6A; 30.0-71.0; 50.0-160.0; 1
+Gateway; Gateway EV730; gwy1B6B; 30.0-71.0; 50.0-160.0; 1
+Gateway; Gateway EV910C; gwy232C; 30.0-95.0; 50.0-160.0; 1
 Gateway; Gateway EV900; gwy8883; 30.0-95.0; 50.0-160.0; 1
 Gateway; Gateway EVF720; gwy031b; 30.0-96.0; 50.0-130.0; 1
 Gateway; Gateway FPD1500; gwy05dc; 30-61; 56-75; 1
+Gateway; Gateway FPD1510 (Analog); gwy05E6; 31.0-61.0; 56.0-75.0; 1
+Gateway; Gateway FPD1510 (Digital); gwy05E7; 31.0-61.0; 56.0-75.0; 1
+Gateway; Gateway FPD1520 R0; gwy05F0; 37.0-66.0; 50.0-75.0; 1
+Gateway; Gateway FPD1520 R1; gwy05F1; 31.0-60.0; 55.0-75.0; 1
+Gateway; Gateway FPD1520 R2; gwy05F2; 31.0-61.0; 56.0-75.0; 1
+Gateway; Gateway FPD1530 R0; gwy05FA; 31.0-63.0; 55.0-75.0; 1
+Gateway; Gateway FPD1530 R1; gwy05FB; 31.0-66.0; 50.0-75.0; 1
+Gateway; Gateway FPD1530 R2; gwy05FC; 31.0-63.0; 56.0-75.0; 1
+Gateway; Gateway FPD1530 R3; gwy05FD; 31.0-66.0; 50.0-75.0; 1
+Gateway; Gateway FPD1530 R4; gwy05FE; 31.0-63.0; 56.0-75.0; 1
+Gateway; Gateway FPD1530 R5; gwy05FF; 31.0-63.0; 56.0-75.0; 1
+Gateway; Gateway FPD1540 R0; gwy0604; 31.0-63.0; 55.0-75.0; 1
+Gateway; Gateway FPD1540 R1; gwy0605; 31.0-63.0; 55.0-75.0; 1
+Gateway; Gateway FPD1540 R2; gwy0606; 31.0-63.0; 55.0-75.0; 1
+Gateway; Gateway FPD1700 R0; gwy06A4; 31.0-80.0; 56.0-85.0; 1
+Gateway; Gateway FPD1700 R1; gwy06A5; 31.0-80.0; 56.0-85.0; 1
+Gateway; Gateway FPD1720; gwy06C3; 30.0-82.0; 56.0-75.0; 1
+Gateway; Gateway FPD1730 R0; gwy06C2; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1730 R1; gwy06C4; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1730 R2; gwy06C5; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1730 R3; gwy06C6; 30.0-83.0; 50.0-75.0; 1
+Gateway; Gateway FPD1730 R4; gwy06C7; 30.0-83.0; 50.0-75.0; 1
+Gateway; Gateway FPD1730 R5; gwy06C8; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1730 R6; gwy06C9; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1730 R7; gwy06CA; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1730 R8; gwy06CB; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1730 R9; gwy06CC; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1730 R10; gwy06CE; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1730 R11; gwy06CF; 30.0-83.0; 56.0-75.0; 1
 Gateway; Gateway FPD1800; gwy0708; 63.9; 60.0; 1
+Gateway; Gateway FPD1810 (Analog); gwy0712; 31.0-80.0; 56.0-85.0; 1
+Gateway; Gateway FPD1810 (Digital); gwy0713; 31.0-80.0; 56.0-85.0; 1
+Gateway; Gateway FPD1830 R0 (Analog); gwy0726; 30.0-83.0; 56.0-76.0; 1
+Gateway; Gateway FPD1830 R0 (Digital); gwy0727; 30.0-83.0; 56.0-76.0; 1
+Gateway; Gateway FPD1830 R1 (Analog); gwy0728; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1830 R1 (Digital); gwy0729; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1830 R2 (Analog); gwy072C; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1830 R2 (Digital); gwy072D; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1830 R3 (Analog); gwy0726; 30.0-83.0; 56.0-85.0; 1
+Gateway; Gateway FPD1830 R3 (Digital); gwy0727; 30.0-83.0; 56.0-85.0; 1
+Gateway; Gateway FPD1830 R4 (Analog); gwy072E; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1830 R4 (Digital); gwy072F; 30.0-68.0; 56.0-75.0; 1
+Gateway; Gateway FPD1930 (Analog); gwy078A; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1930 (Digital); gwy078B; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1940 (Analog); gwy0794; 30.0-83.0; 56.0-75.0; 1
+Gateway; Gateway FPD1940 (Digital); gwy0795; 30.0-71.0; 56.0-75.0; 1
+Gateway; Gateway FPD2020 R0 (Analog); gwy07E4; 30.0-96.0; 56.0-75.0; 1
+Gateway; Gateway FPD2020 R0 (Digital); gwy07E5; 30.0-80.0; 56.0-75.0; 1
+Gateway; Gateway FPD2020 R1 (Analog); gwy07E6; 30.0-96.0; 56.0-85.0; 1
+Gateway; Gateway FPD2020 R1 (Digital); gwy07E7; 30.0-80.0; 56.0-85.0; 1
+Gateway; Gateway FPD2020 R2 (Analog); gwy07E9; 28.0-80.0; 56.0-85.0; 1
+Gateway; Gateway FPD2020 R2 (Digital); gwy07E8; 28.0-80.0; 56.0-85.0; 1
+Gateway; Gateway FPD2200 (Analog); gwy0899; 30.0-70.0; 56.0-61.0; 1
+Gateway; Gateway FPD2200 (Digital); gwy0898; 30.0-70.0; 56.0-61.0; 1
+Gateway; Gateway LE500; gwy1392; 30.0-70.0; 50.0-120.0; 1
 Gateway; Gateway PFL2-15A; gwy060e; 48.0; 60; 1
 Gateway; Gateway Vivitron 15; vivitron15; 31-64; 50-120; 1
 Gateway; Gateway Vivitron 17; vivitron17; 31.5-64; 50-120; 1
 Gateway; Gateway Vivitron 20; vivitron20; 29-82; 50-150; 1
 Gateway; Gateway VX1100; gwy0454; 31.0-108.0; 50.0-160.0; 1
 Gateway; Gateway VX1110; gwy045b; 31.0-115.0; 50.0-160.0; 1
-Gateway; Gateway VX1120; gwy0460; 30-121; 50-160; 1
+Gateway; Gateway VX1120; gwy0460; 30.0-121.0; 50.0-160.0; 1
+Gateway; Gateway VX1120; gwy046A; 30.0-130.0; 50.0-160.0; 1
+Gateway; Gateway VX1130; gwy046B; 30.0-140.0; 50.0-160.0; 1
 Gateway; Gateway VX700A; gwy044e; 30.0-86.0; 50.0-130.0; 1
 Gateway; Gateway VX700; gwy044d; 30.0-86.0; 50.0-120.0; 1
 Gateway; Gateway VX700; mel1673; 30.0-86.0; 50.0-120.0; 1
 Gateway; Gateway VX720; gwy02d0; 30.0-96.0; 50.0-130.0; 1
+Gateway; Gateway VX720A; gwy02DA; 30.0-96.0; 50.0-160.0; 1
+Gateway; Gateway VX730; gwy1B68; 30.0-85.0; 50.0-160.0; 1
+Gateway; Gateway VX730; gwy1B6C; 30.0-85.0; 50.0-160.0; 1
+Gateway; Gateway VX730; gwy1B6D; 30.0-85.0; 50.0-160.0; 1
 Gateway; Gateway VX900; gwy0013; 30.0-95.0; 50.0-160.0; 1
 Gateway; Gateway VX900; gwy9095; 30.0-95.0; 50.0-160.0; 1
 Gateway; Gateway VX900T; gwy00c0; 30.0-96.0; 48.0-120.0; 1
 Gateway; Gateway VX920; gwy0398; 30.0-96.0; 50.0-140.0; 1
+Gateway; Gateway VX920A; gwy03A2; 30.0-110.0; 50.0-160.0; 1
+Gateway; Gateway VX930; gwy232D; 30.0-97.0; 50.0-160.0; 1
+Gateway; Gateway PF41700; gtw7900; 30.0-82.0; 56.0-75.0; 1
+Gateway; Gateway PF41500; gtw7800; 31.0-63.0; 56.0-75.0; 1
 Generic LCD Display; LCD Panel 640x480; 0; 31.5; 40-70
 Generic LCD Display; LCD Panel 800x600; 0; 31.5-37.9; 40-70
 Generic LCD Display; LCD Panel 1024x768; 0; 31.5-48.5; 40-70
@@ -1779,6 +1920,7 @@ IBM; IBM P200; ibm199b; 29.0-90.0; 50.0-120.0; 1
 IBM; IBM P201; ibmp201; 30.0-107.0; 50.0-160.0; 1
 IBM; IBM P50; ibm1999; 30.0-69.0; 50.0-120.0; 1
 IBM; IBM P70; ibm199a; 29.0-82.0; 50.0-120.0; 1
+IBM; IBM P76; IBM1996; 30.0-94.0; 48.0-120.0
 ICL; ICL 14C; icl14c; 34.2-36.2; 50.0-90.0; 1
 ICL; ICL 14M; icl14m; 31.5; 70; 1
 ICL; ICL 14V; icl14v; 37.9; 58.0-75.0; 1
@@ -1868,6 +2010,7 @@ Iiyama; Iiyama TXA3812JT/3822JT, Prolite38e/38f; ivm3810; 24.8-60.0; 56.0-75.0;
 Iiyama; Iiyama TXA3813/3823MT; ivm3820; 24.8-61.0; 55.0-76.0; 1
 Iiyama; Iiyama TXA3832HT, Prolite38c; ivm3808; 24.8-68.7; 56.0-85.0; 1
 Iiyama; Iiyama TXA3833JT, Prolite38g; ivm3818; 24.8-60.0; 56.0-75.0; 1
+Iiyama; Iiyama Prolite E485S; ivm4822; 30.0-83.0; 56.0-76.0; 1
 Iiyama; Iiyama Vision Master MF-8221; mf-8221; 24.8-85.0; 50.0-120.0; 1
 Iiyama; Iiyama Vision Master MF-8317; mf-8317; 30.0-65.0; 50.0-90.0; 1
 Iiyama; Iiyama Vision Master MF-8421; mf-8421; 24.8-85.0; 50.0-120.0; 1
@@ -1994,11 +2137,15 @@ LG Electronics Inc.; LG 1520; 1520; 30.0-65.0; 50.0-120.0; 1
 LG Electronics Inc.; LG 1520DM; 1520dm; 30.0-65.0; 50.0-120.0; 1
 LG Electronics Inc.; LG 1527; 1527; 30.0-57.0; 50.0-110.0; 1
 LG Electronics Inc.; LG 1527; gsm3a9a; 30.0-57.0; 50.0-110.0; 1
+LG Electronics Inc.; LG L1710B(Digital); GSM4358; 30.0-71.0; 56.0-70.0
+LG Electronics Inc.; LG L1710B(Analog); GSM4356; 30.0-83.0; 56.0-70.0
 LG Electronics Inc.; LG 1725; 1725; 30.0-65.0; 50.0-120.0; 1
 LG Electronics Inc.; LG 1725DM; 1725dm; 30.0-65.0; 50.0-120.0; 1
 LG Electronics Inc.; LG 1725s; gsm42cf; 30.0-65.0; 50.0-120.0; 1
 LG Electronics Inc.; LG 1727; 1727; 30.0-65.0; 50.0-120.0; 1
 LG Electronics Inc.; LG 1730DM; 1730dm; 30.0-82.0; 50.0-120.0; 1
+LG Electronics Inc.; LG L1730P(Digital); GSM439E; 30.0-71.0; 56.0-75.0
+LG Electronics Inc.; LG L1730P(Analog); GSM439D; 30.0-83.0; 56.0-75.0
 LG Electronics Inc.; LG 2010; 2010; 30.0-85.0; 50.0-120.0; 1
 LG Electronics Inc.; LG StudioWorks 20i; gsm4e21; 30.0-85.0; 50.0-120.0; 1
 LG Electronics Inc.; LG Studioworks28i; sw28i; 30.0-85.0; 50.0-120.0; 1
@@ -3321,6 +3468,8 @@ Samsung; Samsung SyncMaster 710Tplus/711T/712T (Digital); SAM0166; 30-81; 56-75;
 Samsung; Samsung SyncMaster 710Tplus/711T/712T (Analog); SAM0165; 30-81; 56-75; 1
 Samsung; Samsung SyncMaster 711N/712N; SAM0124; 30-81; 56-85; 1
 Samsung; Samsung SyncMaster 712V/713V/710S/715V; SAM0125; 30-81; 56-75; 1
+Samsung; Samsung SyncMaster 730B (Digital); SAM0192; 30-81; 56-75
+Samsung; Samsung SyncMaster 730B (Analog); SAM0191; 30-81; 56-75
 Samsung; Samsung SyncMaster 750(M)b; sam1059; 30-70; 50-160; 1
 Samsung; Samsung SyncMaster 750(M)s(T); sam1057; 30-70; 50-160; 1
 Samsung; Samsung SyncMaster 750s(T); SAM12B6; 30-70; 50-160; 1
@@ -3339,6 +3488,7 @@ Samsung; Samsung SyncMaster 900SL (CSM92*); sam4db9; 30-96; 50-160; 1
 Samsung; Samsung SyncMaster 905DF(X)/955DF(X)/CD195A; SAM002D; 30-85; 50-160; 1
 Samsung; Samsung SyncMaster 910N/912N; SAM011F; 30-81; 56-85; 1
 Samsung; Samsung SyncMaster 910MP; SAM0187; 30-81; 56-75; 1
+Samsung; Samsung SyncMaster 910V/910M/913V; SAM0115; 30-81; 56-75
 Samsung; Samsung SyncMaster 917MB/950MB/957MB/CD197D(P); SAM0070; 30-96; 50-160; 1
 Samsung; Samsung SyncMaster 920T/CX911T (Digital); SAM014B; 30-81; 56-75; 1
 Samsung; Samsung SyncMaster 920T/CX911T (Analog); SAM014A; 30-81; 56-75; 1
diff --git a/initrd/initrd-stuff/usr/share/hwdata/pci.ids b/initrd/initrd-stuff/usr/share/hwdata/pci.ids
index fb51ff1c..31a692dd 100644
--- a/initrd/initrd-stuff/usr/share/hwdata/pci.ids
+++ b/initrd/initrd-stuff/usr/share/hwdata/pci.ids
@@ -2,12 +2,16 @@
 #	List of PCI ID's
 #
 #	Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the
-#	Linux PCI ID's Project at http://pciids.sf.net/. New data are always
-#	welcome (if they are accurate), we're eagerly expecting new entries,
-#	so if you have anything to contribute, please visit the home page or
-#	send a diff -u against the most recent pci.ids to pci-ids@ucw.cz.
+#	Linux PCI ID's Project at http://pciids.sf.net/.
 #
-#	Daily snapshot on Wed 2005-05-04 07:00:12
+#	New data are always welcome, especially if accurate. If you have
+#	anything to contribute, please follow the instructions at the web site
+#	or send a diff -u against the most recent pci.ids to pci-ids@ucw.cz.
+#
+#	This file can be distributed under either the GNU General Public License
+#	(version 2 or higher) or under the BSD License.
+#
+#	Daily snapshot on Wed 2005-08-31 01:05:03
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -38,7 +42,6 @@
 # 021b is not Compaq but there is a board misprogrammed
 021b  Compaq Computer Corporation
 	8139  HNE-300 (RealTek RTL8139c) [iPaq Networking]
-# http://www.davicom.com.tw/
 0291  Davicom Semiconductor, Inc.
 	8212  DM9102A(DM9102AE, SM9102AF) Ethernet 100/10 MBit(Rev 40)
 # SpeedStream is Efficient Networks, Inc, a Siemens Company
@@ -48,11 +51,18 @@
 	000a  TTP-Monitoring Card V2.0
 0432  SCM Microsystems, Inc.
 	0001  Pluto2 DVB-T Receiver for PCMCIA [EasyWatch MobilSet]
+045e  Microsoft
+	006e  MN-510 802.11b wireless USB paddle
+	00c2  MN-710 wireless USB paddle
 05e3  CyberDoor
 	0701  CBD516
 0675  Dynalink
 	1700  IS64PH ISDN Adapter
 	1702  IS64PH ISDN Adapter
+	1703  ISDN Adapter (PCI Bus, DV, W)
+	1704  ISDN Adapter (PCI Bus, D, C)
+067b  Prolific Technology, Inc.
+	3507  PL-3507 Hi-Speed USB & IEEE 1394 Combo to IDE Bridge Controller
 07e2  ELMEG Communication Systems GmbH
 # Wrong ID used in subsystem ID of VIA USB controllers.
 0925  VIA Technologies, Inc. (Wrong ID)
@@ -60,7 +70,6 @@
 	0704  CM 200E Cable Modem
 0a89  BREA Technologies Inc
 0b49  ASCII Corporation
-# see http://homepage1.nifty.com/mcn/lab/machines/trance_vibrator/usbview.vib.txt
 	064f  Trance Vibrator
 0e11  Compaq Computer Corporation
 	0001  PCI to EISA Bridge
@@ -232,6 +241,7 @@
 		1028 0183  PowerEdge 1800
 		1028 1010  LSI U320 SCSI Controller
 		124b 1170  PMC-USCSI320
+		1734 1052  Primergy RX300 S2
 	0031  53c1030ZC PCI-X Fusion-MPT Dual Ultra320 SCSI
 	0032  53c1035 PCI-X Fusion-MPT Dual Ultra320 SCSI
 		1000 1000  LSI53C1020/1030 PCI-X to Ultra320 SCSI Controller
@@ -286,6 +296,7 @@
 	0629  FC919X LAN
 	0640  FC949X Fibre Channel Adapter
 	0642  FC939X Fibre Channel Adapter
+	0646  FC949ES Fibre Channel Adapter
 	0701  83C885 NT50 DigitalScape Fast Ethernet
 	0702  Yellowfin G-NIC gigabit ethernet
 		1318 0000  PEI100X
@@ -327,16 +338,13 @@
 	4136  Radeon IGP 320 M
 	4137  Radeon IGP330/340/350
 	4144  R300 AD [Radeon 9500 Pro]
-# New PCI ID provided by ATI developer relations (correction to above)
 	4145  R300 AE [Radeon 9700 Pro]
-# New PCI ID provided by ATI developer relations (oops, correction to above)
 	4146  R300 AF [Radeon 9700 Pro]
 	4147  R300 AG [FireGL Z1/X1]
 	4148  R350 AH [Radeon 9800]
 	4149  R350 AI [Radeon 9800]
 	414a  R350 AJ [Radeon 9800]
 	414b  R350 AK [Fire GL X2]
-# New PCI ID provided by ATI developer relations
 	4150  RV350 AP [Radeon 9600]
 		1002 0002  R9600 Pro primary (Asus OEM for HP)
 		1002 0003  R9600 Pro secondary (Asus OEM for HP)
@@ -347,42 +355,35 @@
 		174b 7c29  GC-R9600PRO Primary [Sapphire]
 		17ee 2002  Radeon 9600 256Mb Primary
 		18bc 0101  GC-R9600PRO Primary
-# New PCI ID provided by ATI developer relations
 	4151  RV350 AQ [Radeon 9600]
 		1043 c004  A9600SE
-# New PCI ID provided by ATI developer relations
 	4152  RV350 AR [Radeon 9600]
 		1002 0002  Radeon 9600XT
+		1002 4772  All-in-Wonder 9600 XT
 		1043 c002  Radeon 9600 XT TVD
 		174b 7c29  Sapphire Radeon 9600XT
 		1787 4002  Radeon 9600 XT
-	4153  RV350 AS [Radeon 9600 AS]
+	4153  RV350 AS [Radeon 9550]
 	4154  RV350 AT [Fire GL T2]
 	4155  RV350 AU [Fire GL T2]
 	4156  RV350 AV [Fire GL T2]
 	4157  RV350 AW [Fire GL T2]
 	4158  68800AX [Mach32]
-# The PCI ID is unrelated to any DVI output.
 	4164  R300 AD [Radeon 9500 Pro] (Secondary)
-# New PCI ID info provided by ATI developer relations
 	4165  R300 AE [Radeon 9700 Pro] (Secondary)
-# New PCI ID info provided by ATI developer relations
 	4166  R300 AF [Radeon 9700 Pro] (Secondary)
-# New PCI ID provided by ATI developer relations
 	4168  Radeon R350 [Radeon 9800] (Secondary)
-# New PCI ID provided by ATI developer relations (correction to above)
 	4170  RV350 AP [Radeon 9600] (Secondary)
 		1458 4025  Giga-Byte GV-R96128D Secondary
 		148c 2067  PowerColor R96A-C3N (Secondary)
 		174b 7c28  GC-R9600PRO Secondary [Sapphire]
 		17ee 2003  Radeon 9600 256Mb Secondary
 		18bc 0100  GC-R9600PRO Secondary
-# New PCI ID provided by ATI developer relations (correction to above)
 	4171  RV350 AQ [Radeon 9600] (Secondary)
 		1043 c005  A9600SE (Secondary)
-# New PCI ID provided by ATI developer relations (correction to above)
 	4172  RV350 AR [Radeon 9600] (Secondary)
 		1002 0003  Radeon 9600XT (Secondary)
+		1002 4773  All-in-Wonder 9600 XT (Secondary)
 		1043 c003  A9600XT (Secondary)
 		174b 7c28  Sapphire Radeon 9600XT (Secondary)
 		1787 4003  Radeon 9600 XT (Secondary)
@@ -393,6 +394,7 @@
 	4243  R200 BC [Radeon All in Wonder 8500]
 	4336  Radeon Mobility U1
 		103c 0024  Pavilion ze4400 builtin Video
+		161f 2029  eMachines M5312 builtin Video
 	4337  Radeon IGP 330M/340M/350M
 		1014 053a  ThinkPad R40e (2684-HVG) builtin VGA controller
 		103c 0850  Radeon IGP 345M
@@ -407,8 +409,14 @@
 	4358  210888CX [Mach64 CX]
 	4363  ATI SMBus
 	436e  ATI 436E Serial ATA Controller
-	4372  ATI SMBus
+	4370  IXP SB400 AC'97 Audio Controller
+	4371  IXP SB400 PCI-PCI Bridge
+	4372  IXP SB400 SMBus Controller
+	4373  IXP SB400 USB2 Host Controller
+	4374  IXP SB400 USB Host Controller
+	4375  IXP SB400 USB Host Controller
 	4376  Standard Dual Channel PCI IDE Controller ATI
+	4377  IXP SB400 PCI-ISA Bridge
 	4379  ATI 4379 Serial ATA Controller
 	437a  ATI 437A Serial ATA Controller
 	4437  Radeon Mobility 7000 IGP
@@ -463,6 +471,8 @@
 		1028 00ce  PowerEdge 1400
 		1028 00d1  PowerEdge 2550
 		1028 00d9  PowerEdge 2500
+		1028 0134  Poweredge SC600
+		1734 007a  Primergy RX300
 		8086 3411  SDS2 Mainboard
 		8086 3427  S875WP1-E mainboard
 	4753  Rage XC
@@ -506,6 +516,8 @@
 	4a4e  M18 JN [Radeon Mobility 9800]
 	4a50  R420 JP [Radeon X800XT]
 	4a70  R420 [X800XT-PE] (Secondary)
+	4b49  R480 [Radeon X850XT]
+	4b69  R480 [Radeon X850XT secondary]
 	4c42  3D Rage LT Pro AGP-133
 		0e11 b0e7  Rage LT Pro (Compaq Presario 5240)
 		0e11 b0e8  Rage 3D LT Pro
@@ -532,6 +544,7 @@
 		1014 0154  ThinkPad A20m
 		1028 00aa  Latitude CPt
 		1028 00bb  Latitude CPx
+		10e1 10cf  Fujitsu Siemens LifeBook C Series
 	4c4e  Rage Mobility L AGP 2x
 	4c50  3D Rage LT Pro
 		1002 4c50  Rage LT Pro
@@ -563,16 +576,12 @@
 	4e45  Radeon R300 NE [Radeon 9500 Pro]
 		1002 0002  Radeon R300 NE [Radeon 9500 Pro]
 		1681 0002  Hercules 3D Prophet 9500 PRO [Radeon 9500 Pro]
-# New PCI ID provided by ATI developer relations (correction to above)
 	4e46  RV350 NF [Radeon 9600]
 	4e47  Radeon R300 NG [FireGL X1]
-# (added pro)
 	4e48  Radeon R350 [Radeon 9800 Pro]
-# New PCI ID provided by ATI developer relations
 	4e49  Radeon R350 [Radeon 9800]
 	4e4a  RV350 NJ [Radeon 9800 XT]
 	4e4b  R350 NK [Fire GL X2]
-# New PCI ID provided by ATI developer relations
 	4e50  RV350 [Mobility Radeon 9600 M10]
 		1025 005a  TravelMate 290
 		103c 088c  nc8000 laptop
@@ -587,12 +596,9 @@
 	4e65  Radeon R300 [Radeon 9500 Pro] (Secondary)
 		1002 0003  Radeon R300 NE [Radeon 9500 Pro]
 		1681 0003  Hercules 3D Prophet 9500 PRO [Radeon 9500 Pro] (Secondary)
-# New PCI ID provided by ATI developer relations (correction to above)
 	4e66  RV350 NF [Radeon 9600] (Secondary)
 	4e67  Radeon R300 [FireGL X1] (Secondary)
-# (added pro)
 	4e68  Radeon R350 [Radeon 9800 Pro] (Secondary)
-# New PCI ID provided by ATI developer relations
 	4e69  Radeon R350 [Radeon 9800] (Secondary)
 	4e6a  RV350 NJ [Radeon 9800 XT] (Secondary)
 		1002 4e71  ATI Technologies Inc M10 NQ [Radeon Mobility 9600]
@@ -688,6 +694,7 @@
 		1002 003a  Radeon 7000/Radeon VE
 		1002 00ba  Radeon 7000/Radeon VE
 		1002 013a  Radeon 7000/Radeon VE
+		1028 019a  PowerEdge SC1425
 		1458 4002  RV100 QY [RADEON 7000 PRO MAYA AV Series]
 		148c 2003  RV100 QY [Radeon 7000 Multi-Display Edition]
 		148c 2023  RV100 QY [Radeon 7000 Evil Master Multi-Display]
@@ -774,10 +781,14 @@
 	5941  RV280 [Radeon 9200] (Secondary)
 		1458 4019  Gigabyte Radeon 9200
 		174b 7c12  Sapphire Radeon 9200
-# http://www.hightech.com.hk/html/9200.htm
 		17af 200d  Excalibur Radeon 9200
 		18bc 0050  GeXcube GC-R9200-C3 (Secondary)
 	5944  RV280 [Radeon 9200 SE (PCI)]
+	5950  RS480 Host Bridge
+	5954  RS480 [Radeon Xpress 200G Series]
+		1002 5954  RV370 [Radeon Xpress 200G Series]
+	5955  ATI Radeon XPRESS 200M 5955 (PCIE)
+		1002 5955  RS480 0x5955 [ATI Radeon XPRESS 200M 5955 (PCIE)]
 	5960  RV280 [Radeon 9200 PRO]
 	5961  RV280 [Radeon 9200]
 		1002 2f72  All-in-Wonder 9200 Series
@@ -785,7 +796,6 @@
 		12ab 5961  YUAN SMARTVGA Radeon 9200
 		1458 4018  Gigabyte Radeon 9200
 		174b 7c13  Sapphire Radeon 9200
-# http://www.hightech.com.hk/html/9200.htm
 		17af 200c  Excalibur Radeon 9200
 		18bc 0050  Radeon 9200 Game Buster
 		18bc 0051  GeXcube GC-R9200-C3
@@ -799,17 +809,20 @@
 		1787 5964  Excalibur 9200SE VIVO 128M
 		17af 2012  Radeon 9200 SE Excalibur
 		18bc 0170  Sapphire Radeon 9200 SE 128MB Game Buster
-# 128MB DDR, DVI/VGA/TV out
 		18bc 0173  GC-R9200L(SE)-C3H [Radeon 9200 Game Buster]
+	5a34  RS480 PCI-X Root Port
 	5b60  RV370 5B60 [Radeon X300 (PCIE)]
 		1043 002a  Extreme AX300SE-X
 		1043 032e  Extreme AX300/TD
 	5b62  RV370 5B62 [Radeon X600 (PCIE)]
 	5b64  RV370 5B64 [FireGL V3100 (PCIE)]
 	5b65  RV370 5B65 [FireGL D1100 (PCIE)]
+	5b70  RV370 [Radeon X300SE]
 	5b72  Radeon X600(RV380)
+	5b74  RV370 5B64 [FireGL V3100 (PCIE)] (Secondary)
 	5c61  M9+ 5C61 [Radeon Mobility 9200 (AGP)]
 	5c63  M9+ 5C63 [Radeon Mobility 9200 (AGP)]
+		1002 5c63  Apple iBook G4 2004
 	5d44  RV280 [Radeon 9200 SE] (Secondary)
 		1458 4019  Radeon 9200 SE (Secondary)
 		174b 7c12  Sapphire Radeon 9200 SE (Secondary)
@@ -819,13 +832,19 @@
 		18bc 0172  GC-R9200L(SE)-C3H [Radeon 9200 Game Buster]
 	5d4a  Mobility Radeon X800
 	5d4d  R480 [Radeon X850XT Platinum (PCIE)]
+	5d52  R480 [Radeon X850XT (PCIE)] (Primary)
 	5d57  R423 5F57 [Radeon X800XT (PCIE)]
 	5d6d  R480 [Radeon X850XT Platinum (PCIE)] (Secondary)
-	5d72  R480 [Radeon X850XT (PCIE)]
+	5d72  R480 [Radeon X850XT (PCIE)] (Secondary)
+	5d77  R423 5F57 [Radeon X800XT (PCIE)] (Secondary)
+	5e4b  RV410 [Radeon X700 Pro (PCIE)]
+	5e6b  RV410 [Radeon X700 Pro (PCIE)] Secondary
 	700f  PCI Bridge [IGP 320M]
 	7010  PCI Bridge [IGP 340M]
+	7833  Radeon 9100 IGP Host Bridge
 	7834  Radeon 9100 PRO IGP
 	7835  Radeon Mobility 9200 IGP
+	7838  Radeon 9100 IGP PCI/AGP Bridge
 	7c37  RV350 AQ [Radeon 9600 SE]
 	cab0  AGP Bridge [IGP 320M]
 	cab2  RS200/RS200M AGP Bridge [IGP 340M]
@@ -1209,6 +1228,7 @@
 		1028 0475  PowerEdge RAID Controller 3/SC
 		1028 0493  PowerEdge RAID Controller 3/DC
 		1028 0511  PowerEdge Cost Effective RAID Controller ATA100/4Ch
+		103c 60e7  NetRAID-1M
 	9010  MegaRAID 428 Ultra RAID Controller
 	9030  EIDE Controller
 	9031  EIDE Controller
@@ -1240,6 +1260,7 @@
 		1259 2454  AT-2450v4 10Mb Ethernet Adapter
 		1259 2700  AT-2700TX 10/100 Fast Ethernet
 		1259 2701  AT-2700FX 100Mb Ethernet
+		1259 2703  AT-2701FX
 		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
 		4c53 1010  CP5/CR6 mainboard
 		4c53 1020  VR6 mainboard
@@ -1252,6 +1273,7 @@
 	2003  Am 1771 MBW [Alchemy]
 	2020  53c974 [PCscsi]
 	2040  79c974
+	208f  CS5536 GeodeLink PCI South Bridge
 	3000  ELanSC520 Microcontroller
 	7006  AMD-751 [Irongate] System Controller
 	7007  AMD-751 [Irongate] AGP Bridge
@@ -1297,6 +1319,7 @@
 	7468  AMD-8111 LPC
 		161f 3017  HDAMB
 	7469  AMD-8111 IDE
+		1022 2b80  AMD-8111 IDE [Quartet]
 		161f 3017  HDAMB
 	746a  AMD-8111 SMBus 2.0
 	746b  AMD-8111 ACPI
@@ -1446,6 +1469,7 @@
 		1028 016f  PowerEdge Expandable RAID Controller 4e/Di
 		1028 0170  PowerEdge Expandable RAID Controller 4e/Di
 	0014  Remote Access Card 4 Daughter Card SMIC interface
+	0015  PowerEdge Expandable RAID controller 5
 1029  Siemens Nixdorf IS
 102a  LSI Logic
 	0000  HYDRA
@@ -1520,7 +1544,7 @@
 		102b ff03  Millennium G200 AGP
 		102b ff04  Marvel G200 AGP
 		110a 0032  MGA-G200 AGP
-	0525  MGA G400 AGP
+	0525  G400/G450
 		0e11 b16f  MGA-G400 AGP
 		102b 0328  Millennium G400 16Mb SDRAM
 		102b 0338  Millennium G400 16Mb SDRAM
@@ -1568,6 +1592,12 @@
 		1705 0004  Millennium G450 16MB
 	0527  MGA Parhelia AGP
 		102b 0840  Parhelia 128Mb
+		102b 0850  Parhelia 256MB AGP 4X
+	0528  Parhelia 8X
+		102b 1020  Parhelia 128MB
+		102b 1030  Parhelia 256 MB Dual DVI
+		102b 14e1  Parhelia PCI 256MB
+		102b 2021  QID Pro
 	0d10  MGA Ultima/Impression
 	1000  MGA G100 [Productiva]
 		102b ff01  Productiva G100
@@ -1585,7 +1615,18 @@
 		102b 0f83  Millennium G550
 		102b 0f84  Millennium G550 Dual Head DDR 32Mb
 		102b 1e41  Millennium G550
-	2537  MGA G650 AGP
+	2537  Millenium P650/P750
+		102b 1820  Millennium P750 64MB
+		102b 1830  Millennium P650 64MB
+		102b 1c10  QID 128MB
+		102b 2811  Millennium P650 Low-profile PCI 64MB
+		102b 2c11  QID Low-profile PCI
+	2538  Millenium P650 PCIe
+		102b 08c7  Millennium P650 PCIe 128MB
+		102b 0907  Millennium P650 PCIe 64MB
+		102b 1047  Millennium P650 LP PCIe 128MB
+		102b 1087  Millennium P650 LP PCIe 64MB
+		102b 3007  QID Low-profile PCIe
 	4536  VIA Framegrabber
 	6573  Shark 10/100 Multiport SwitchNIC
 102c  Chips and Technologies
@@ -1613,7 +1654,6 @@
 		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
 		4c53 1050  CT7 mainboard
 		4c53 1051  CE7 mainboard
-# C5C project cancelled
 		4c53 1080  CT8 mainboard
 102d  Wyse Technology Inc.
 	50dc  3328 Audio
@@ -1660,7 +1700,10 @@
 	0035  USB
 		1179 0001  USB
 		12ee 7000  Root Hub
+		14c2 0105  PTI-205N USB 2.0 Host Controller
 		1799 0001  Root Hub
+		1931 000a  GlobeTrotter Fusion Quad Lite (PPP data)
+		1931 000b  GlobeTrotter Fusion Quad Lite (GSM data)
 		807d 0035  PCI-USB2 (OHCI subsystem)
 	003b  PCI to C-bus Bridge
 	003e  NAPCCARD Cardbus Controller
@@ -1687,8 +1730,8 @@
 	00ce  IEEE 1394 Host Controller
 	00df  Vr4131
 	00e0  USB 2.0
-		0ee4 3383  Sitecom IEEE 1394 / USB2.0 Combo Card
 		12ee 7001  Root hub
+		14c2 0205  PTI-205N USB 2.0 Host Controller
 		1799 0002  Root Hub
 		807d 1043  PCI-USB2 (EHCI subsystem)
 	00e7  IEEE 1394 Host Controller
@@ -1704,15 +1747,18 @@
 1039  Silicon Integrated Systems [SiS]
 	0001  Virtual PCI-to-PCI bridge (AGP)
 	0002  SG86C202
+	0003  SiS AGP Port (virtual PCI-to-PCI bridge)
+	0004  PCI-to-PCI bridge
 	0006  85C501/2/3
 	0008  SiS85C503/5513 (LPC Bridge)
 	0009  ACPI
-# source: http://members.datafast.net.au/dft0802/downloads/pcidevs.txt
+	000a  PCI-to-PCI bridge
 	0016  SiS961/2 SMBus Controller
 	0018  SiS85C503/5513 (LPC Bridge)
-# Controller for 2 PATA and 2 SATA channels
 	0180  RAID bus controller 180 SATA/PATA  [SiS]
-	0181  SiS SATA
+	0181  SATA
+	0182  182 SATA/RAID Controller
+	0191  191 Gigabit Ethernet Adapter
 	0200  5597/5598/6326 VGA
 		1039 0000  SiS5597 SVGA (Shared RAM)
 	0204  82C204
@@ -1736,7 +1782,7 @@
 	0635  635 Host
 	0645  SiS645 Host & Memory & AGP Controller
 	0646  SiS645DX Host & Memory & AGP Controller
-	0648  SiS 645xx
+	0648  645xx
 	0650  650/M650 Host
 	0651  651 Host
 	0655  655 Host
@@ -1751,6 +1797,7 @@
 	0746  746 Host
 	0755  755 Host
 	0760  760/M760 Host
+	0761  761/M761 Host
 	0900  SiS900 PCI Fast Ethernet
 		1019 0a14  K7S5A motherboard
 		1039 0900  SiS900 10/100 Ethernet Adapter
@@ -1794,7 +1841,7 @@
 		1092 4910  SpeedStar A70
 		1092 4920  SpeedStar A70
 		1569 6326  SiS6326 GUI Accelerator
-	6330  661/741/760 PCI/AGP VGA Display Adapter
+	6330  661/741/760/761 PCI/AGP VGA Display Adapter
 		1039 6330  [M]661xX/[M]741[GX]/[M]760 PCI/AGP VGA Adapter
 	7001  USB 1.0 Controller
 		1019 0a14  K7S5A motherboard
@@ -1882,8 +1929,12 @@
 	127c  sx1000 I/O Controller
 	1290  Auxiliary Diva Serial Port
 	12b4  zx1 QuickSilver AGP8x Local Bus Adapter
+	12fa  BCM4306 802.11b/g Wireless LAN Controller
 	2910  E2910A PCIBus Exerciser
 	2925  E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
+	3080  Pavilion ze2028ea
+	3220  Hewlett-Packard Smart Array P600
+	3230  Hewlett-Packard Smart Array Controller
 103e  Solliday Engineering
 103f  Synopsys/Logic Modeling Group
 1040  Accelgraphics Inc.
@@ -1896,6 +1947,9 @@
 	3020  Samurai_IDE
 1043  ASUSTeK Computer Inc.
 	0675  ISDNLink P-IN100-ST-D
+		0675 1704  ISDN Adapter (PCI Bus, D, C)
+		0675 1707  ISDN Adapter (PCI Bus, DV, W)
+		10cf 105e  ISDN Adapter (PCI Bus, DV, W)
 	4015  v7100 SDRAM [GeForce2 MX]
 	4021  v7100 Combo Deluxe [GeForce2 MX + TV tuner]
 	4057  v8200 GeForce 3
@@ -1977,6 +2031,7 @@
 	1000  QuickStep 1000
 	3000  QuickStep 3000
 	8901  Gloria XL
+		1048 0935  GLoria XL (Virge)
 1049  Fountain Technologies, Inc.
 # # nee SGS Thomson Microelectronics
 104a  STMicroelectronics
@@ -1985,7 +2040,6 @@
 	0010  STG4000 [3D Prophet Kyro Series]
 	0209  STPC Consumer/Industrial North- and Southbridge
 	020a  STPC Atlas/ConsumerS/Consumer IIA Northbridge
-# From <http://gatekeeper.dec.com/pub/BSD/FreeBSD/FreeBSD-stable/src/share/misc/pci_vendors>
 	0210  STPC Atlas ISA Bridge
 	021a  STPC Consumer S Southbridge
 	021b  STPC Consumer IIA Southbridge
@@ -2012,7 +2066,11 @@
 		1040 0011  AccelStar II
 		1048 0a31  WINNER 2000
 		1048 0a32  GLoria Synergy
+		1048 0a34  GLoria Synergy
 		1048 0a35  GLoria Synergy
+		1048 0a36  GLoria Synergy
+		1048 0a43  GLoria Synergy
+		1048 0a44  GLoria Synergy
 		107d 2633  WinFast 3D L2300
 		1092 0127  FIRE GL 1000 PRO
 		1092 0136  FIRE GL 1000 PRO
@@ -2046,41 +2104,51 @@
 	8022  TSB43AB22 IEEE-1394a-2000 Controller (PHY/Link)
 	8023  TSB43AB22/A IEEE-1394a-2000 Controller (PHY/Link)
 		103c 088c  nc8000 laptop
+		1043 808b  K8N4-E Mainboard
 	8024  TSB43AB23 IEEE-1394a-2000 Controller (PHY/Link)
 	8025  TSB82AA2 IEEE-1394b Link Layer Controller
-		55aa 55aa  FireWire 800 PCI Card
 	8026  TSB43AB21 IEEE-1394a-2000 Controller (PHY/Link)
+		1043 808d  A7V333 mainboard.
 	8027  PCI4451 IEEE-1394 Controller
 		1028 00e6  PCI4451 IEEE-1394 Controller (Dell Inspiron 8100)
 	8029  PCI4510 IEEE-1394 Controller
 		1028 0163  Latitude D505
+		1028 0196  Inspiron 5160
 		1071 8160  MIM2900
 	802b  PCI7410,7510,7610 OHCI-Lynx Controller
+		1028 0139  Latitude D400
 		1028 014e  PCI7410,7510,7610 OHCI-Lynx Controller (Dell Latitude D800)
 	802e  PCI7x20 1394a-2000 OHCI Two-Port PHY/Link-Layer Controller
-	8031  Texas Instruments PCIxx21/x515 Cardbus Controller
-	8032  Texas Instruments OHCI Compliant IEEE 1394 Host Controller
-	8033  Texas Instruments PCIxx21 Integrated FlashMedia Controller
-	8034  Texas Instruments PCI6411, PCI6421, PCI6611, PCI6621, PCI7411, PCI7421, PCI7611, PCI7621 Secure Digital (SD) Controller
-	8035  Texas Instruments PCI6411, PCI6421, PCI6611, PCI6621, PCI7411, PCI7421, PCI7611, PCI7621 Smart Card Controller (SMC)
+	8031  PCIxx21/x515 Cardbus Controller
+		103c 099c  nx6110
+	8032  OHCI Compliant IEEE 1394 Host Controller
+		103c 099c  nx6110
+	8033  PCIxx21 Integrated FlashMedia Controller
+	8034  PCI6411, PCI6421, PCI6611, PCI6621, PCI7411, PCI7421, PCI7611, PCI7621 Secure Digital (SD) Controller
+	8035  PCI6411, PCI6421, PCI6611, PCI6621, PCI7411, PCI7421, PCI7611, PCI7621 Smart Card Controller (SMC)
+	8036  PCI6515 Cardbus Controller
+	8038  PCI6515 SmartCard Controller
 	8201  PCI1620 Firmware Loading Function
 	8204  PCI7410,7510,7610 PCI Firmware Loading Function
+		1028 0139  Latitude D400
 		1028 014e  Latitude D800
 	8400  ACX 100 22Mbps Wireless Interface
-		00fc 16ec  U.S. Robotics 22 Mbps Wireless PC Card (model 2210)
-		00fd 16ec  U.S. Robotics 22Mbps Wireless PCI Adapter (model 2216)
 		1186 3b00  DWL-650+ PC Card cardbus 22Mbs Wireless Adapter [AirPlus]
 		1186 3b01  DWL-520+ 22Mbps PCI Wireless Adapter
 	8401  ACX 100 22Mbps Wireless Interface
-# OK, this info is almost useless as is, but at least it's known that it's a wireless card. More info requested from reporter (whi
+# OK, this info is almost useless as is, but at least it's known that it's a wireless card. More info requested from reporter.
 	9000  Wireless Interface (of unknown type)
 	9066  ACX 111 54Mbps Wireless Interface
+		104c 9066  Netgear WG311v2 802.11b/g 54Mbps Wifi PCI card
+		1186 3b04  DWL-G520+ Wireless PCI Adapter
 		1186 3b05  DWL-G650+ AirPlusG+ CardBus Wireless LAN
+		13d1 aba0  SWLMP-54108 108Mbps Wireless mini PCI card 802.11g+
 	a001  TDC1570
 	a100  TDC1561
 	a102  TNETA1575 HyperSAR Plus w/PCI Host i/f & UTOPIA i/f
-	a106  TMS320C6205 Fixed Point DSP
+	a106  TMS320C6414 TMS320C6415 TMS320C6416
 		175c 5000  ASI50xx Audio Adapter
+		175c 6400  ASI6400 Cobranet series
 		175c 8700  ASI87xx Radio Tuner card
 	ac10  PCI1050
 	ac11  PCI1053
@@ -2095,9 +2163,10 @@
 	ac1a  PCI1210
 	ac1b  PCI1450
 		0e11 b113  Armada M700
+		1014 0130  Thinkpad T20
 	ac1c  PCI1225
 		0e11 b121  Armada E500
-		1028 0088  Dell  Computer Corporation  Latitude CPi A400XT
+		1028 0088  Latitude CPi A400XT
 	ac1d  PCI1251A
 	ac1e  PCI1211
 	ac1f  PCI1251B
@@ -2113,11 +2182,14 @@
 		1028 00e6  PCI4451 PC card CardBus Controller (Dell Inspiron 8100)
 	ac44  PCI4510 PC card Cardbus Controller
 		1028 0163  Latitude D505
+		1028 0196  Inspiron 5160
 		1071 8160  MIM2000
 	ac46  PCI4520 PC card Cardbus Controller
 	ac47  PCI7510 PC card Cardbus Controller
+		1028 0139  Latitude D400
 		1028 014e  Latitude D800
 	ac4a  PCI7510,7610 PC card Cardbus Controller
+		1028 0139  Latitude D400
 		1028 014e  Latitude D800
 	ac50  PCI1410 PC card Cardbus Controller
 	ac51  PCI1420
@@ -2125,6 +2197,7 @@
 		1028 00b1  Latitude C600
 		1028 012a  Latitude C640
 		1033 80cd  Versa Note VXi
+		1095 10cf  Fujitsu-Siemens LifeBook C Series
 		10cf 1095  Lifebook C6155
 		e4bf 1000  CP2-2-HIPHOP
 	ac52  PCI1451 PC card Cardbus Controller
@@ -2138,6 +2211,7 @@
 		175c 5100  ASI51xx Audio Adapter
 		175c 6100  ASI61xx Audio Adapter
 		175c 6200  ASI62xx Audio Adapter
+		175c 8800  ASI88xx Audio Adapter
 	ac8d  PCI 7620
 	ac8e  PCI7420 CardBus Controller
 	ac8f  PCI7420/PCI7620 Dual Socket CardBus and Smart Card Cont. w/ 1394a-2000 OHCI Two-Port  PHY/Link-Layer Cont. and SD/MS-Pro Sockets
@@ -2167,6 +2241,12 @@
 	0940  W89C940
 	5a5a  W89C940F
 	6692  W6692
+		1043 1702  ISDN Adapter (PCI Bus, D, W)
+		1043 1703  ISDN Adapter (PCI Bus, DV, W)
+		1043 1707  ISDN Adapter (PCI Bus, DV, W)
+		144f 1702  ISDN Adapter (PCI Bus, D, W)
+		144f 1703  ISDN Adapter (PCI Bus, DV, W)
+		144f 1707  ISDN Adapter (PCI Bus, DV, W)
 	9921  W99200F MPEG-1 Video Encoder
 	9922  W99200F/W9922PF MPEG-1/2 Video Encoder
 	9970  W9970CF
@@ -2261,7 +2341,6 @@
 1058  Electronics & Telecommunications RSH
 1059  Teknor Industrial Computers Inc
 105a  Promise Technology, Inc.
-# more correct description from promise linux sources
 	0d30  PDC20265 (FastTrak100 Lite/Ultra100)
 		105a 4d33  Ultra100
 	0d38  20263
@@ -2277,10 +2356,14 @@
 	3375  PDC20375 (SATA150 TX2plus)
 	3376  PDC20376 (FastTrak 376)
 		1043 809e  A7V8X motherboard
+	3515  PDC40719
 	3519  PDC40519 (FastTrak TX4200)
 	3571  PDC20571 (FastTrak TX2200)
 	3574  PDC20579 SATAII 150 IDE Controller
+	3577  PDC40779 (SATA 300 779)
+	3d17  PDC20718 (SATA 300 TX4)
 	3d18  PDC20518/PDC40518 (SATAII 150 TX4)
+	3d73  PDC40775 (SATA 300 TX2plus)
 	3d75  PDC20575 (SATAII150 TX2plus)
 	4d30  PDC20267 (FastTrak100/Ultra100)
 		105a 4d33  Ultra100
@@ -2296,6 +2379,7 @@
 	4d69  20269
 		105a 4d68  Ultra133TX2
 	5275  PDC20276 (MBFastTrak133 Lite)
+		1043 807e  A7V333 motherboard.
 		105a 0275  SuperTrak SX6000 IDE
 		105a 1275  MBFastTrak133 Lite (tm) Controller (RAID mode)
 		1458 b001  MBUltra 133
@@ -2309,6 +2393,7 @@
 	6626  PDC20618 (Ultra 618)
 	6629  PDC20619 (FastTrak TX4000)
 	7275  PDC20277 (SBFastTrak133 Lite)
+	8002  SATAII150 SX8
 105b  Foxconn International, Inc.
 105c  Wipro Infotech Limited
 105d  Number 9 Computer Company
@@ -2398,14 +2483,25 @@
 	0010  DAC960PG
 	0020  DAC960LA
 	0050  AcceleRAID 352/170/160 support Device
-	b166  Gemstone chipset SCSI controller
+		1069 0050  AcceleRAID 352 support Device
+		1069 0052  AcceleRAID 170 support Device
+		1069 0054  AcceleRAID 160 support Device
+	b166  AcceleRAID 600/500/400/Sapphire support Device
 		1014 0242  iSeries 2872 DASD IOA
 		1014 0266  Dual Channel PCI-X U320 SCSI Adapter
 		1014 0278  Dual Channel PCI-X U320 SCSI RAID Adapter
 		1014 02d3  Dual Channel PCI-X U320 SCSI Adapter
 		1014 02d4  Dual Channel PCI-X U320 SCSI RAID Adapter
+		1069 0200  AcceleRAID 400, Single Channel, PCI-X, U320, SCSI RAID
+		1069 0202  AcceleRAID Sapphire, Dual Channel, PCI-X, U320, SCSI RAID
+		1069 0204  AcceleRAID 500, Dual Channel, Low-Profile, PCI-X, U320, SCSI RAID
+		1069 0206  AcceleRAID 600, Dual Channel, PCI-X, U320, SCSI RAID
 	ba55  eXtremeRAID 1100 support Device
 	ba56  eXtremeRAID 2000/3000 support Device
+		1069 0030  eXtremeRAID 3000 support Device
+		1069 0040  eXtremeRAID 2000 support Device
+	ba57  eXtremeRAID 4000/5000 support Device
+		1069 0072  eXtremeRAID 5000 support Device
 106a  Aten Research Inc
 106b  Apple Computer Inc.
 	0001  Bandit PowerPC host bridge
@@ -2435,6 +2531,7 @@
 	002f  UniNorth 1.5 Internal PCI
 	0030  UniNorth/Pangea FireWire
 	0031  UniNorth 2 FireWire
+		106b 5811  iBook G4 2004
 	0032  UniNorth 2 GMAC (Sun GEM)
 	0033  UniNorth 2 ATA/100
 	0034  UniNorth 2 AGP
@@ -2626,7 +2723,7 @@
 	a801  Tomatillo PCI Bus Module
 	abba  Cassini 10/100/1000
 108f  Systemsoft
-1090  Encore Computer Corporation
+1090  Compro Computer Services, Inc.
 1091  Intergraph Corporation
 	0020  3D graphics processor
 	0021  3D graphics processor w/Texturing
@@ -2694,6 +2791,7 @@
 	c801  PCI-GPIB
 	c831  PCI-GPIB bridge
 1094  First International Computers [FIC]
+# nee CMD Technology Inc
 1095  Silicon Image, Inc.
 	0240  Adaptec AAR-1210SA SATA HostRAID Controller
 	0640  PCI0640
@@ -2714,11 +2812,13 @@
 	3112  SiI 3112 [SATALink/SATARaid] Serial ATA Controller
 		1095 3112  SiI 3112 SATALink Controller
 		1095 6112  SiI 3112 SATARaid Controller
+		9005 0250  SATAConnect 1205SA Host Controller
 	3114  SiI 3114 [SATALink/SATARaid] Serial ATA Controller
 		1095 3114  SiI 3114 SATALink Controller
 		1095 6114  SiI 3114 SATARaid Controller
 	3124  SiI 3124 PCI-X Serial ATA Controller
 		1095 3124  SiI 3124 PCI-X Serial ATA Controller
+	3132  SiI 3132 Serial ATA Raid II Controller
 	3512  SiI 3512 [SATALink/SATARaid] Serial ATA Controller
 		1095 3512  SiI 3512 SATALink Controller
 		1095 6512  SiI 3512 SATARaid Controller
@@ -2765,6 +2865,7 @@
 		1851 1850  FlyVideo'98 - Video
 		1851 1851  FlyVideo II
 		1852 1852  FlyVideo'98 - Video (with FM Tuner)
+		18ac d500  DViCO FusionHDTV5 Lite
 		270f fc00  Digitop DTT-1000
 		bd11 1200  PCTV pro (TV + FM stereo receiver)
 	036f  Bt879 Video Capture
@@ -2815,6 +2916,7 @@
 		127a 0048  Bt878 Video Capture (Audio Section)
 		13e9 0070  Win/TV (Audio Section)
 		144f 3000  MagicTView CPH060 - Audio
+		1461 0002  Avermedia PCTV98 Audio Capture
 		1461 0004  AVerTV WDM Audio Capture
 		1461 0761  AVerTV DVB-T
 		14f1 0001  Bt878 Video Capture (Audio Section)
@@ -2822,6 +2924,7 @@
 		14f1 0003  Bt878 Video Capture (Audio Section)
 		14f1 0048  Bt878 Video Capture (Audio Section)
 		1822 0001  VisionPlus DVB Card
+		18ac d500  DViCO FusionHDTV5 Lite
 		270f fc00  Digitop DTT-1000
 		bd11 1200  PCTV pro (TV + FM stereo receiver, audio section)
 	0879  Bt879 Audio Capture
@@ -2897,8 +3000,12 @@
 	100a  IOC4 I/O controller
 	2001  Fibre Channel
 	2002  ASDE
+	4001  TIO-CE PCI Express Bridge
+	4002  TIO-CE PCI Express Port
 	8001  O2 1394
 	8002  G-net NT
+	8010  Broadcom e-net [SGI IO9/IO10 BaseIO]
+	8018  Broadcom e-net [SGI A330 Server BaseIO]
 10aa  ACC Microelectronics
 	0000  ACCM 2188
 10ab  Digicom
@@ -2930,14 +3037,23 @@
 	1146  VScom 010 1 port parallel adaptor
 	1147  VScom 020 2 port parallel adaptor
 	2724  Thales PCSM Security Card
+	6540  PCI6540/6466 PCI-PCI bridge (transparent mode)
+		4c53 10e0  PSL09 PrPMC
+	6541  PCI6540/6466 PCI-PCI bridge (non-transparent mode, primary side)
+		4c53 10e0  PSL09 PrPMC
+	6542  PCI6540/6466 PCI-PCI bridge (non-transparent mode, secondary side)
+		4c53 10e0  PSL09 PrPMC
 	8516  PEX 8516  Versatile PCI Express Switch
 	8532  PEX 8532  Versatile PCI Express Switch
 	9030  PCI <-> IOBus Bridge Hot Swap
 		10b5 2862  Alpermann+Velte PCL PCI LV (3V/5V): Timecode Reader Board
 		10b5 2906  Alpermann+Velte PCI TS (3V/5V): Time Synchronisation Board
 		10b5 2940  Alpermann+Velte PCL PCI D (3V/5V): Timecode Reader Board
+		10b5 2978  SH ARC-PCIu SOHARD ARCNET card
 		10b5 3025  Alpermann+Velte PCL PCI L (3V/5V): Timecode Reader Board
 		10b5 3068  Alpermann+Velte PCL PCI HD (3V/5V): Timecode Reader Board
+		1397 3136  4xS0-ISDN PCI Adapter
+		1397 3137  S2M-E1-ISDN PCI Adapter
 		15ed 1002  MCCS 8-port Serial Hot Swap
 		15ed 1003  MCCS 16-port Serial Hot Swap
 	9036  9036
@@ -2946,7 +3062,7 @@
 		10b5 1172  IK220 (Heidenhain)
 		10b5 2036  SatPak GPS
 		10b5 2221  Alpermann+Velte PCL PCI LV: Timecode Reader Board
-		10b5 2273  SH-ARC SoHard ARCnet card
+		10b5 2273  SH ARC-PCI SOHARD ARCNET card
 		10b5 2431  Alpermann+Velte PCL PCI D: Timecode Reader Board
 		10b5 2905  Alpermann+Velte PCI TS: Time Synchronisation Board
 		10b5 9050  MP9050
@@ -2961,9 +3077,7 @@
 		15ed 1001  Macrolink MCCS 16-port Serial
 		15ed 1002  Macrolink MCCS 8-port Serial Hot Swap
 		15ed 1003  Macrolink MCCS 16-port Serial Hot Swap
-# Sorry, there was a typo
 		5654 2036  OpenSwitch 6 Telephony card
-# Sorry, there was a typo
 		5654 3132  OpenSwitch 12 Telephony card
 		5654 5634  OpenLine4 Telephony Card
 		d531 c002  PCIntelliCAN 2xSJA1000 CAN bus
@@ -2992,7 +3106,7 @@
 		12d9 0002  PCI Prosody Card rev 1.5
 		16df 0011  PIKA PrimeNet MM PCI
 		16df 0012  PIKA PrimeNet MM cPCI 8
-		16df 0013  PIKA PrimeNet MM cPCI 8 (without CAS Signaling Option)
+		16df 0013  PIKA PrimeNet MM cPCI 8 (without CAS Signaling)
 		16df 0014  PIKA PrimeNet MM cPCI 4
 		16df 0015  PIKA Daytona MM
 		16df 0016  PIKA InLine MM
@@ -3003,7 +3117,7 @@
 		125c 0640  Aries 16000P
 	906e  9060ES
 	9080  9080
-		103c 10eb  (Agilent) E2777B 83K Series PCI based Optical Communication Interface
+		103c 10eb  (Agilent) E2777B 83K Series Optical Communication Interface
 		103c 10ec  (Agilent) E6978-66442 PCI CIC
 		10b5 9080  9080 [real subsystem ID not set]
 		129d 0002  Aculab PCI Prosidy card
@@ -3179,7 +3293,6 @@
 		13a2 8006  LANEPIC Cardbus Fast Ethernet Adapter
 	1000  FDC 37c665
 	1001  FDC 37C922
-# 802.11g card
 	2802  SMC2802W [EZ Connect g]
 	a011  83C170QF
 	b106  SMC34C90
@@ -3210,6 +3323,7 @@
 		10b9 1541  ALI M1541 Aladdin V/V+ AGP System Controller
 	1543  M1543
 	1563  M1563 HyperTransport South Bridge
+	1573  PCI to LPC Controller
 	1621  M1621
 	1631  ALI M1631 PCI North Bridge Aladdin Pro III
 	1632  M1632M Northbridge+Trident
@@ -3223,6 +3337,7 @@
 	1681  M1681 P4 Northbridge [AGP8X,HyperTransport and SDR/DDR]
 	1687  M1687 K8 Northbridge [AGP8X and HyperTransport]
 	1689  M1689 K8 Northbridge [Super K8 Single Chip]
+	1695  M1695 K8 Northbridge [PCI Express and HyperTransport]
 	3141  M3141
 	3143  M3143
 	3145  M3145
@@ -3247,6 +3362,7 @@
 	5237  USB 1.1 Controller
 		1014 0540  ThinkPad R40e (2684-HVG) builtin USB
 		103c 0024  Pavilion ze4400 builtin USB
+		104d 810f  VAIO PCG-U1 USB/OHCI Revision 1.0
 	5239  USB 2.0 Controller
 	5243  M1541 PCI to AGP Controller
 	5246  AGP8X Controller
@@ -3258,6 +3374,7 @@
 	5263  M5263 Ethernet Controller
 	5281  ALi M5281 Serial ATA / RAID Host Controller
 	5287  ULi 5287 SATA
+	5288  ULi M5288 SATA
 	5289  ULi 5289 SATA
 	5450  Lucent Technologies Soft Modem AMR
 	5451  M5451 PCI AC-Link Controller Audio Device
@@ -3270,10 +3387,9 @@
 	5457  M5457 AC'97 Modem Controller
 		1014 0535  ThinkPad R40e (2684-HVG) builtin modem
 		103c 0024  Pavilion ze4400 builtin Modem Device
-# Same but more usefull for driver's lookup
 	5459  SmartLink SmartPCI561 56K Modem
-# SmartLink PCI SoftModem
 	545a  SmartLink SmartPCI563 56K Modem
+	5461  High Definition Audio/AC'97 Host Controller
 	5471  M5471 Memory Stick Controller
 	5473  M5473 SD-MMC Controller
 	7101  M7101 Power Management Controller [PMU]
@@ -3398,7 +3514,9 @@
 	0020  NV4 [RIVA TNT]
 		1043 0200  V3400 TNT
 		1048 0c18  Erazor II SGRAM
+		1048 0c19  Erazor II
 		1048 0c1b  Erazor II
+		1048 0c1c  Erazor II
 		1092 0550  Viper V550
 		1092 0552  Viper V550
 		1092 4804  Viper V550
@@ -3423,7 +3541,14 @@
 		1043 0205  PCI-V3800
 		1043 4000  AGP-V3800PRO
 		1048 0c21  Synergy II
-		1048 0c31  Erazor III
+		1048 0c28  Erazor III
+		1048 0c29  Erazor III
+		1048 0c2a  Erazor III
+		1048 0c2b  Erazor III
+		1048 0c31  Erazor III Pro
+		1048 0c32  Erazor III Pro
+		1048 0c33  Erazor III Pro
+		1048 0c34  Erazor III Pro
 		107d 2134  WinFast 3D S320 II + TV-Out
 		1092 4804  Viper V770
 		1092 4a00  Viper V770
@@ -3440,6 +3565,9 @@
 		1043 0200  AGP-V3800 Deluxe
 		1043 0201  AGP-V3800 Ultra SDRAM
 		1043 0205  PCI-V3800 Ultra
+		1048 0c2e  Erazor III Ultra
+		1048 0c2f  Erazor III Ultra
+		1048 0c30  Erazor III Ultra
 		1102 1021  3D Blaster RIVA TNT2 Ultra
 		1102 1029  3D Blaster RIVA TNT2 Ultra
 		1102 102f  3D Blaster RIVA TNT2 Ultra
@@ -3457,6 +3585,7 @@
 		1043 0200  AGP-V3800M
 		1043 0201  AGP-V3800M
 		1048 0c3a  Erazor III LT
+		1048 0c3b  Erazor III LT
 		10de 001e  M64 AGP4x
 		1102 1023  CT6892 RIVA TNT2 Value
 		1102 1024  CT6932 RIVA TNT2 Value 32Mb
@@ -3478,24 +3607,36 @@
 	003e  MCP04 Serial ATA Controller
 	0040  nv40 [GeForce 6800 Ultra]
 	0041  NV40 [GeForce 6800]
+		1043 817b  V9999 Gamer Edition
 	0042  NV40.2 [GeForce 6800 LE]
 	0043  NV40.3
 	0045  NV40 [GeForce 6800 GT]
 	0049  NV40GL
 	004e  NV40GL [Quadro FX 4000]
+	0050  CK804 ISA Bridge
+		1043 815a  K8N4-E Mainboard
 	0051  CK804 ISA Bridge
 	0052  CK804 SMBus
+		1043 815a  K8N4-E Mainboard
 	0053  CK804 IDE
+		1043 815a  K8N4-E Mainboard
 	0054  CK804 Serial ATA Controller
 	0055  CK804 Serial ATA Controller
+		1043 815a  K8N4-E Mainboard
 	0056  CK804 Ethernet Controller
 	0057  CK804 Ethernet Controller
+		1043 8141  K8N4-E Mainboard
+	0058  CK804 AC'97 Modem
 	0059  CK804 AC'97 Audio Controller
+		1043 812a  K8N4-E Mainboard
 	005a  CK804 USB Controller
+		1043 815a  K8N4-E Mainboard
 	005b  CK804 USB Controller
+		1043 815a  K8N4-E Mainboard
 	005c  CK804 PCI Bridge
 	005d  CK804 PCIE Bridge
 	005e  CK804 Memory Controller
+	005f  CK804 Memory Controller
 	0060  nForce2 ISA Bridge
 		1043 80ad  A7N8X Mainboard
 	0064  nForce2 SMBus (MCP)
@@ -3512,6 +3653,7 @@
 	006c  nForce2 External PCI Bridge
 	006d  nForce2 PCI Bridge
 	006e  nForce2 FireWire (IEEE 1394) Controller
+	0080  MCP2A ISA bridge
 	0084  MCP2A SMBus
 	0085  MCP2A IDE
 	0086  MCP2A Ethernet Controller
@@ -3521,6 +3663,7 @@
 	008b  MCP2A PCI Bridge
 	008c  MCP2A Ethernet Controller
 	008e  nForce2 Serial ATA Controller
+	0091  GeForce 7800 GTX
 	00a0  NV5 [Aladdin TNT2]
 		14af 5810  Maxi Gamer Xentor
 	00c0  NV41.0
@@ -3566,7 +3709,7 @@
 	00ee  CK8S Serial ATA Controller (v2.5)
 	00f0  NV40 [GeForce 6800/GeForce 6800 Ultra]
 	00f1  NV43 [GeForce 6600/GeForce 6600 GT]
-	00f2  NV43 [GeForce 6600 GT]
+	00f2  NV43 [GeForce 6600/GeForce 6600 GT]
 	00f3  NV43 [GeForce 6200]
 	00f8  NV45GL [Quadro FX 3400/4400]
 	00f9  NV40 [GeForce 6800 Ultra/GeForce 6800 GT]
@@ -3582,20 +3725,34 @@
 		1043 0201  AGP-V6600 SDRAM
 		1043 4008  AGP-V6600 SGRAM
 		1043 4009  AGP-V6600 SDRAM
+		1048 0c41  Erazor X
+		1048 0c43  ERAZOR X PCI
+		1048 0c48  Synergy Force
 		1102 102d  CT6941 GeForce 256
 		14af 5022  3D Prophet SE
 	0101  NV10DDR [GeForce 256 DDR]
 		1043 0202  AGP-V6800 DDR
 		1043 400a  AGP-V6800 DDR SGRAM
 		1043 400b  AGP-V6800 DDR SDRAM
+		1048 0c42  Erazor X
 		107d 2822  WinFast GeForce 256
 		1102 102e  CT6971 GeForce 256 DDR
 		14af 5021  3D Prophet DDR-DVI
 	0103  NV10GL [Quadro]
+		1048 0c40  GLoria II-64
+		1048 0c4a  GLoria II-64 Pro
+		1048 0c4b  GLoria II-64 Pro DVII
 	0110  NV11 [GeForce2 MX/MX 400]
 		1043 4015  AGP-V7100 Pro
 		1043 4031  V7100 Pro with TV output
+		1048 0c60  Gladiac MX
+		1048 0c61  Gladiac 511PCI
+		1048 0c63  Gladiac 511TV-OUT 32MB
+		1048 0c64  Gladiac 511TV-OUT 64MB
+		1048 0c65  Gladiac 511TWIN
+		1048 0c66  Gladiac 311
 		10de 0091  Dell OEM GeForce 2 MX 400
+		10de 00a1  Apple OEM GeForce2 MX
 		1462 8817  MSI GeForce2 MX400 Pro32S [MS-8817]
 		14af 7102  3D Prophet II MX
 		14af 7103  3D Prophet II MX Dual-Display
@@ -3604,13 +3761,17 @@
 	0113  NV11GL [Quadro2 MXR/EX/Go]
 	0140  NV43 [GeForce 6600 GT]
 	0141  NV43 [GeForce 6600]
+		1458 3124  GV-NX66128DP Turboforce Edition
 	0144  NV43 [GeForce Go 6600]
 	0145  NV43 [GeForce 6610 XL]
+	0146  NV43 [Geforce Go 6600TE/6200TE]
 	0148  NV43 [GeForce Go 6600]
 	014e  NV43GL [Quadro FX 540]
 	014f  NV43 [GeForce 6200]
 	0150  NV15 [GeForce2 GTS/Pro]
 		1043 4016  V7700 AGP Video Card
+		1048 0c50  Gladiac
+		1048 0c52  Gladiac-64
 		107d 2840  WinFast GeForce2 GTS with TV output
 		107d 2842  WinFast GeForce 2 Pro
 		1462 8831  Creative GeForce2 Pro
@@ -3620,12 +3781,14 @@
 	0152  NV15BR [GeForce2 Ultra, Bladerunner]
 		1048 0c56  GLADIAC Ultra
 	0153  NV15GL [Quadro2 Pro]
-	0161  NV44 [GeForce 6200 TurboCache]
+	0161  GeForce 6200 TurboCache(TM)
 	0164  NV44 [GeForce Go 6200]
 	0165  NV44 [Quadro NVS 285]
+	0167  GeForce Go 6200 TurboCache
 	0170  NV17 [GeForce4 MX 460]
 	0171  NV17 [GeForce4 MX 440]
 		10b0 0002  Gainward Pro/600 TV
+		10de 0008  Apple OEM GeForce4 MX 440
 		1462 8661  G4MX440-VTP
 		1462 8730  MX440SES-T (MS-8873)
 		147b 8f00  Abit Siluro GeForce4MX440
@@ -3689,6 +3852,7 @@
 		1043 405b  V8200 T5
 		1545 002f  Xtasy 6964
 	0203  NV20DCC [Quadro DCC]
+	0221  GeForce 6200
 	0240  C51 PCI Express Bridge
 	0241  C51 PCI Express Bridge
 	0242  C51 PCI Express Bridge
@@ -3743,6 +3907,8 @@
 	0288  NV28GL [Quadro4 980 XGL]
 	0289  NV28GL [Quadro4 780 XGL]
 	028c  NV28GLM [Quadro4 700 GoGL]
+# NV2A Xbox Graphics Processing Unit (Intergrated). GeForce3 derivative (NV20 < NV2A < NV25)
+	02a0  NV2A [XGPU]
 	02f0  C51 Host Bridge
 	02f1  C51 Host Bridge
 	02f2  C51 Host Bridge
@@ -3783,6 +3949,7 @@
 		1462 9171  MS-8917 (FX5200-T128)
 	0323  NV34 [GeForce FX 5200LE]
 	0324  NV34M [GeForce FX Go5200]
+		1028 0196  Inspiron 5160
 		1071 8160  MIM2000
 	0325  NV34M [GeForce FX Go5250]
 	0326  NV34 [GeForce FX 5500]
@@ -3814,6 +3981,25 @@
 	034c  NV36 [Quadro FX Go1000]
 	034e  NV36GL [Quadro FX 1100]
 	034f  NV36GL
+	0360  MCP55 LPC Bridge
+	0361  MCP55 LPC Bridge
+	0362  MCP55 LPC Bridge
+	0363  MCP55 LPC Bridge
+	0364  MCP55 LPC Bridge
+	0365  MCP55 LPC Bridge
+	0366  MCP55 LPC Bridge
+	0367  MCP55 LPC Bridge
+	0368  MCP55 SMBus
+	0369  MCP55 Memory Controller
+	036a  MCP55 Memory Controller
+	036c  MCP55 USB Controller
+	036d  MCP55 USB Controller
+	036e  MCP55 IDE
+	0372  MCP55 Ethernet
+	0373  MCP55 Ethernet
+	037a  MCP55 Memory Controller
+	037e  MCP55 SATA Controller
+	037f  MCP55 SATA Controller
 10df  Emulex Corporation
 	1ae5  LP6000 Fibre Channel Host Adapter
 	1ae6  LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)
@@ -3826,14 +4012,14 @@
 	f0d5  LP1150 Fibre Channel Host Adapter
 	f100  LP11000e Fibre Channel Host Adapter
 	f700  LP7000 Fibre Channel Host Adapter
-	f701  LP 7000EFibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)
+	f701  LP7000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)
 	f800  LP8000 Fibre Channel Host Adapter
-	f801  LP 8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)
+	f801  LP8000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)
 	f900  LP9000 Fibre Channel Host Adapter
-	f901  LP 9000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)
+	f901  LP9000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)
 	f980  LP9802 Fibre Channel Host Adapter
-	f981  LP 9802 Fibre Channel Host Adapter Alternate ID
-	f982  LP 9802 Fibre Channel Host Adapter Alternate ID
+	f981  LP9802 Fibre Channel Host Adapter Alternate ID
+	f982  LP9802 Fibre Channel Host Adapter Alternate ID
 	fa00  LP10000 Fibre Channel Host Adapter
 	fa01  LP101 Fibre Channel Host Adapter
 	fd00  LP11000 Fibre Channel Host Adapter
@@ -4011,7 +4197,7 @@
 		1102 8040  CT4760 SBLive!
 		1102 8051  CT4850 SBLive! Value
 		1102 8061  SBLive! Player 5.1
-		1102 8064  SB Live! 5.1 Model SB0100
+		1102 8064  SBLive! 5.1 Model SB0100
 		1102 8065  SBLive! 5.1 Digital Model SB0220
 		1102 8067  SBLive! 5.1 eMicro 28028
 	0004  SB Audigy
@@ -4022,7 +4208,7 @@
 		1102 2002  SB Audigy 2 ZS (SB0350)
 	0006  [SB Live! Value] EMU10k1X
 	0007  SB Audigy LS
-		1102 0007  Sound Blaster Live! 24bit
+		1102 0007  SBLive! 24bit
 		1102 1001  SB0310 Audigy LS
 		1102 1002  SB0312 Audigy LS
 		1102 1006  SB0410 SBLive! 24-bit
@@ -4078,12 +4264,16 @@
 	8470  EM8470 REALmagic DVD/MPEG-4 A/V Decoder
 	8471  EM8471 REALmagic DVD/MPEG-4 A/V Decoder
 	8475  EM8475 REALmagic DVD/MPEG-4 A/V Decoder
+		1105 0001  REALmagic X-Card
 	8476  EM8476 REALmagic DVD/MPEG-4 A/V Decoder
+		127d 0000  CineView II
 	8485  EM8485 REALmagic DVD/MPEG-4 A/V Decoder
 	8486  EM8486 REALmagic DVD/MPEG-4 A/V Decoder
 1106  VIA Technologies, Inc.
 	0102  Embedded VIA Ethernet Controller
 	0130  VT6305 1394.A Controller
+# Wrong ID found on Jetway K8M8MS
+	0204  K8M800 Host Bridge
 	0238  K8T890 Host Bridge
 	0259  CN400/PM880 Host Bridge
 	0269  KT880 Host Bridge
@@ -4106,9 +4296,9 @@
 		1019 0985  P6VXA Motherboard
 		1019 0a81  L7VTA v1.0 Motherboard (KT400-8235)
 		1043 8052  VT8233A Bus Master ATA100/66/33 IDE
-		1043 808c  A7V8X motherboard
+		1043 808c  A7V8X / A7V333 motherboard
 		1043 80a1  A7V8X-X motherboard rev. 1.01
-		1043 80ed  A7V600 motherboard
+		1043 80ed  A7V600/K8V-X motherboard
 		1106 0571  VT82C586/B/VT82C686/A/B/VT8233/A/C/VT8235 PIPC Bus Master IDE
 		1179 0001  Magnia Z310
 		1297 f641  FX41 motherboard
@@ -4181,14 +4371,14 @@
 	287d  VT8251 PCIE Root Port
 	287e  VT8251 Ultra VLINK Controller
 	3022  CLE266
-# This is *not* USB 2.0 as the existing entry suggests
 	3038  VT82xxxxx UHCI USB 1.1 Controller
 		0925 1234  USB Controller
 		1019 0985  P6VXA Motherboard
 		1019 0a81  L7VTA v1.0 Motherboard (KT400-8235)
+		1043 8080  A7V333 motherboard
 		1043 808c  VT6202 USB2.0 4 port controller
 		1043 80a1  A7V8X-X motherboard
-		1043 80ed  A7V600 motherboard
+		1043 80ed  A7V600/K8V-X motherboard
 		1179 0001  Magnia Z310
 		1458 5004  GA-7VAX Mainboard
 		1462 7020  K8T NEO 2 motherboard
@@ -4203,6 +4393,7 @@
 		1025 005a  TravelMate 290
 		1458 1000  GA-7VT600-1394 Motherboard
 		1462 702d  K8T NEO 2 motherboard
+		1462 971d  MS-6917
 	3050  VT82C596 Power Management
 	3051  VT82C596 Power Management
 	3053  VT6105M [Rhine-III]
@@ -4235,12 +4426,15 @@
 		1462 0080  K8T NEO 2 motherboard
 		1462 3800  KT266 onboard audio
 		147b 1407  KV8-MAX3 motherboard
+		4005 4710  MSI K7T266 Pro2-RU (MSI-6380 v2) onboard audio (Realtek/ALC 200/200P)
 	3065  VT6102 [Rhine-II]
 		1043 80a1  A7V8X-X Motherboard
 		1106 0102  VT6102 [Rhine II] Embeded Ethernet Controller on VT8235
 		1186 1400  DFE-530TX rev A
 		1186 1401  DFE-530TX rev B
 		13b9 1421  LD-10/100AL PCI Fast Ethernet Adapter (rev.B)
+		1695 3005  VT6103
+		1695 300c  Realtek ALC655 sound chip
 # This hosts more than just the Intel 537 codec, it also hosts PCtel (SIL33) and SmartLink (SIL34) codecs
 	3068  AC'97 Modem Controller
 		1462 309e  MS-6309 Saturn Motherboard
@@ -4258,7 +4452,7 @@
 		1019 0a81  L7VTA v1.0 Motherboard (KT400-8235)
 		1043 808c  A7V8X motherboard
 		1043 80a1  A7V8X-X motherboard rev 1.01
-		1043 80ed  A7V600 motherboard
+		1043 80ed  A7V600/K8V-X motherboard
 		1297 f641  FX41 motherboard
 		1458 5004  GA-7VAX Mainboard
 		1462 7020  K8T NEO 2 motherboard
@@ -4274,21 +4468,19 @@
 		1297 f641  FX41 motherboard
 	3118  S3 Unichrome Pro VGA Adapter
 	3119  VT6120/VT6121/VT6122 Gigabit Ethernet Adapter
-# found on EPIA M6000/9000 mainboard
 	3122  VT8623 [Apollo CLE266] integrated CastleRock graphics
-# found on EPIA M6000/9000 mainboard
 	3123  VT8623 [Apollo CLE266]
 	3128  VT8753 [P4X266 AGP]
 	3133  VT3133 Host Bridge
 	3147  VT8233A ISA Bridge
+		1043 808c  A7V333 motherboard
 	3148  P4M266 Host Bridge
 	3149  VIA VT6420 SATA RAID Controller
-		1043 80ed  A7V600/K8V Deluxe motherboard
+		1043 80ed  A7V600/K8V Deluxe/K8V-X motherboard
 		1458 b003  GA-7VM400AM(F) Motherboard
 		1462 7020  K8T Neo 2 Motherboard
 		147b 1407  KV8-MAX3 motherboard
 	3156  P/KN266 Host Bridge
-# on ASUS P4P800
 	3164  VT6410 ATA133 RAID controller
 	3168  VT8374 P4X400 Host Controller/AGP Bridge
 	3177  VT8235 ISA Bridge
@@ -4300,7 +4492,7 @@
 		1849 3177  K7VT2 motherboard
 	3178  ProSavageDDR P4N333 Host Bridge
 	3188  VT8385 [K8T800 AGP] Host Bridge
-		1043 80a3  K8V Deluxe motherboard
+		1043 80a3  K8V Deluxe/K8V-X motherboard
 		147b 1407  KV8-MAX3 motherboard
 	3189  VT8377 [KT400/KT600 AGP] Host Bridge
 		1043 807f  A7V8X motherboard
@@ -4312,7 +4504,7 @@
 	3213  VPX/VPX2 PCI to PCI Bridge Controller
 	3218  K8T800M Host Bridge
 	3227  VT8237 ISA bridge [KT600/K8T800/K8T890 South]
-		1043 80ed  A7V600 motherboard
+		1043 80ed  A7V600/K8V-X motherboard
 		1106 3227  DFI KT600-AL Motherboard
 		1458 5001  GA-7VT600 Motherboard
 		147b 1407  KV8-MAX3 motherboard
@@ -4348,7 +4540,6 @@
 	5308  PT894 I/O APIC Interrupt Controller
 	6100  VT85C100A [Rhine II]
 	7204  K8M800 Host Bridge
-# S3 Graphics UniChrome™ 2D/3D Graphics with motion compensation
 	7205  VT8378 [S3 UniChrome] Integrated Video
 		1458 d000  Gigabyte GA-7VM400(A)M(F) Motherboard
 	7208  PT890 Host Bridge
@@ -4391,7 +4582,6 @@
 	b213  VPX/VPX2 I/O APIC Interrupt Controller
 	c208  PT890 PCI to PCI Bridge Controller
 	c238  K8T890 PCI to PCI Bridge Controller
-# 32-Bit PCI bus master Ethernet MAC with standard MII interface
 	d104  VT8237 Integrated Fast Ethernet Controller
 	d208  PT890 PCI to PCI Bridge Controller
 	d213  VPX/VPX2 PCI to PCI Bridge Controller
@@ -4422,6 +4612,7 @@
 	007b  FSC Remote Service Controller, mailbox device
 	007c  FSC Remote Service Controller, shared memory device
 	007d  FSC Remote Service Controller, SMIC device
+	2101  HST SAPHIR V Primary PCI (ISDN/PMx)
 # Superfastcom-PCI (Commtech, Inc.) or DSCC4 WAN Adapter
 	2102  DSCC4 PEB/PEF 20534 DMA Supported Serial Communication Controller with 4 Channels
 	2104  Eicon Diva 2.02 compatible passive ISDN card
@@ -4462,7 +4653,7 @@
 	d301  CPWNA100 (Philips wireless PCMCIA)
 	ec02  SMC 1244TX v3
 1114  Atmel Corporation
-	0506  802.11b Wireless Network Adaptor (at76c506)
+	0506  at76c506 802.11b Wireless Network Adaptor
 1115  3D Labs
 1116  Data Translation
 	0022  DT3001
@@ -4612,22 +4803,64 @@
 	5402  TriMedia TM-1300
 		1244 0f00  Fritz!Card DSL
 	7130  SAA7130 Video Broadcast Decoder
-		5168 0138  LiveView FlyVideo 2000
-	7133  SAA713X Audio+video broadcast decoder
-		1489 0214  Genius VideoWonder ProTV/LifeView FlyTV Platinum FM
+		102b 48d0  Matrox CronosPlus
+		1048 226b  ELSA EX-VISION 500TV
+		1131 2001  10MOONS PCI TV CAPTURE CARD
+		1461 050c  Nagase Sangyo TransGear 3000TV
+		1461 10ff  AVerMedia DVD EZMaker
+		1461 2108  AverMedia AverTV/305
+		1461 2115  AverMedia AverTV Studio 305
+		153b 1152  Terratec Cinergy 200 TV
+		185b c100  Compro VideoMate TV PVR/FM
+		5168 0138  LifeView FlyVIDEO2000
+	7133  SAA7133 Video Broadcast Decoder
+		1019 4cb5  Elitegroup ECS TVP3XP FM1236 Tuner Card (NTSC,FM)
+		1043 0210  MiniPCI TV Card
+		1043 4843  ASUS TV-FM 7133
+		1131 2001  Proteus Pro [philips reference design]
+		1461 f31f  Avermedia AVerTV GO 007 FM
+		1489 0214  LifeView FlyTV Platinum FM/Genius VideoWonder ProTV
+		153b 1162  Terratec Cinergy 400 mobile
+		185b c100  Compro VideoMate TV Gold+
 		5168 0138  LifeView FlyVideo 3000
 		5168 0212  LifeView FlyTV Platinum mini
+		5168 0214  LifeView FlyTV Platinum
+		5168 0306  LifeView FlyDVB-T DUO
 		5168 0502  LifeView FlyDVB-T Duo CardBus
-# PCI audio and video broadcast decoder (http://www.semiconductors.philips.com/pip/saa7134hl)
-	7134  SAA7134
+	7134  SAA7134 Video Broadcast Decoder
+		1019 4cb4  Elitegroup ECS TVP3XP FM1216 Tuner Card(PAL-BG,FM)
+		1043 4840  ASUS TV-FM 7134
 		1043 4842  TV-FM Card 7134
-	7135  SAA7135 Audio+video broadcast decoder
+		1131 4e85  SKNet Monster TV
+		1131 6752  EMPRESS
+		1131 7133  AOPEN VA1000 POWER
+		11bd 002b  Pinnacle PCTV Stereo (saa7134)
+		11bd 002d  Pinnacle PCTV 300i DVB-T + PAL
+		1461 9715  Avermedia AVerTV Studio 307
+		1461 a70a  Avermedia AVerTV 307
+		1461 a70b  AverMedia M156 / Medion 2819
+		1461 d6ee  AVerMedia Cardbus TV/Radio
+		153b 1142  Terratec Cinergy 400 TV
+		153b 1143  Terratec Cinergy 600 TV
+		153b 1158  Terratec Cinergy 600 TV MK3
+		1540 9524  ProVideo PV952
+		16be 0003  Medion 7134
+		185b c200  Compro VideoMate Gold+ Pal
+		1894 a006  KNC One TV-Station DVR
+		1894 fe01  KNC One TV-Station RDS / Typhoon TV Tuner RDS
+	7135  SAA7135 Video Broadcast Decoder
+		1421 0350  ADS Tech Instant TV
+		1421 0370  ADS Tech Instant TV (cardbus version)
+		5168 0212  LifeView FlyTV Platinum Mini
 	7145  SAA7145
 	7146  SAA7146
 		110a 0000  Fujitsu/Siemens DVB-C card rev1.5
 		110a ffff  Fujitsu/Siemens DVB-C card rev1.5
 		1131 4f56  KNC1 DVB-S Budget
-		1131 4f61  Fujitsu-Siemens Activy DVB-S Budget
+		1131 4f60  Fujitsu-Siemens Activy DVB-S Budget Rev AL
+		1131 4f61  Activy DVB-S Budget Rev GR
+# It has an LSI companion chip.
+		1131 5f61  Activy DVB-T Budget
 		114b 2003  DVRaptor Video Edit/Capture Card
 		11bd 0006  DV500 Overlay
 		11bd 000a  DV500 Overlay
@@ -4648,8 +4881,8 @@
 		13c2 1011  Technotrend-Budget / Hauppauge WinTV-NOVA-T DVB card
 		13c2 1013  SATELCO Multimedia DVB
 		13c2 1102  Technotrend/Hauppauge DVB card rev2.1
+	9730  SAA9730 Integrated Multimedia and Peripheral Controller
 1132  Mitel Corp.
-# This is the new official company name. See disclaimer on www.eicon.com for details!
 1133  Eicon Networks Corporation
 	7901  EiconCard S90
 	7902  EiconCard S90
@@ -4678,36 +4911,25 @@
 	e00e  Diva ISDN+CT S/T PCI Rev 2
 	e010  Diva Server BRI-2M PCI
 		110a 0021  Fujitsu Siemens ISDN S0
-		8001 0014  Diva Server BRI-2M PCI Cornet NQ
 	e011  Diva Server BRI S/T Rev 2
 	e012  Diva Server 4BRI-8M PCI
-		8001 0014  Diva Server 4BRI-8M PCI Cornet NQ
 	e013  Diva Server 4BRI Rev 2
 		1133 1300  Diva Server V-4BRI-8
 		1133 e013  Diva Server 4BRI-8M 2.0 PCI
-		8001 0014  Diva Server 4BRI-8M 2.0 PCI Cornet NQ
 	e014  Diva Server PRI-30M PCI
-		0008 0100  Diva Server PRI-30M PCI
-		8001 0014  Diva Server PRI-30M PCI Cornet NQ
 	e015  DIVA Server PRI Rev 2
 		1133 e015  Diva Server PRI 2.0 PCI
-		8001 0014  Diva Server PRI 2.0 PCI Cornet NQ
 	e016  Diva Server Voice 4BRI PCI
-		8001 0014  Diva Server PRI Cornet NQ
 	e017  Diva Server Voice 4BRI Rev 2
 		1133 e017  Diva Server Voice 4BRI-8M 2.0 PCI
-		8001 0014  Diva Server Voice 4BRI-8M 2.0 PCI Cornet NQ
 	e018  Diva Server BRI-2M 2.0 PCI
 		1133 1800  Diva Server V-BRI-2
 		1133 e018  Diva Server BRI-2M 2.0 PCI
-		8001 0014  Diva Server BRI-2M 2.0 PCI Cornet NQ
 	e019  Diva Server Voice PRI Rev 2
 		1133 e019  Diva Server Voice PRI 2.0 PCI
-		8001 0014  Diva Server Voice PRI 2.0 PCI Cornet NQ
 	e01a  Diva Server 2FX
 	e01b  Diva Server Voice BRI-2M 2.0 PCI
 		1133 e01b  Diva Server Voice BRI-2M 2.0 PCI
-		8001 0014  Diva Server Voice BRI-2M 2.0 PCI Cornet NQ
 	e01c  Diva Server PRI Rev 3
 		1133 1c01  Diva Server PRI/E1/T1-8
 		1133 1c02  Diva Server PRI/T1-24
@@ -4729,6 +4951,8 @@
 	e028  Diva Server Analog-8P
 		1133 2800  Diva Server V-Analog-8P
 		1133 e028  Diva Server Analog-8P
+	e02a  Diva Server IPM-300
+	e02c  Diva Server IPM-600
 1134  Mercury Computer Systems
 	0001  Raceway Bridge
 	0002  Dual PCI to RapidIO Bridge
@@ -4777,9 +5001,10 @@
 	f012  NinjaSCSI-32 Logitec
 	f013  NinjaSCSI-32 Logitec
 	f015  NinjaSCSI-32 Melco
+	f020  NinjaSCSI-32 Sony PCGA-DVD51
 1146  Force Computers
 1147  Interface Corp
-# Formerly (Schneider & Koch)
+# Nee Schneider & Koch
 1148  SysKonnect
 	4000  FDDI Adapter
 		0e11 b03b  Netelligent 100 FDDI DAS Fibre SC
@@ -4976,7 +5201,8 @@
 1164  Advanced Peripherals Technologies
 1165  Imagraph Corporation
 	0001  Motion TPEG Recorder/Player with audio
-1166  Broadcom (formerly ServerWorks)
+# nee ServerWorks
+1166  Broadcom
 	0000  CMIC-LE
 	0005  CNB20-LE Host Bridge
 	0006  CNB20HE Host Bridge
@@ -4991,29 +5217,42 @@
 	0015  CMIC-GC Host Bridge
 	0016  CMIC-GC Host Bridge
 	0017  GCNB-LE Host Bridge
+	0036  HT1000 PCI/PCI-X bridge
 	0101  CIOB-X2 PCI-X I/O Bridge
+	0104  HT1000 PCI/PCI-X bridge
 	0110  CIOB-E I/O Bridge with Gigabit Ethernet
+	0130  HT1000 PCI-X bridge
+	0132  HT1000 PCI-Express bridge
 	0200  OSB4 South Bridge
 	0201  CSB5 South Bridge
 		4c53 1080  CT8 mainboard
 	0203  CSB6 South Bridge
+		1734 1012  Primergy RX300
+	0205  HT1000 Legacy South Bridge
 	0211  OSB4 IDE Controller
 	0212  CSB5 IDE Controller
 		4c53 1080  CT8 mainboard
 	0213  CSB6 RAID/IDE Controller
+		1028 c134  Poweredge SC600
+		1734 1012  Primergy RX300
+	0214  HT1000 Legacy IDE controller
 	0217  CSB6 IDE Controller
+		1028 4134  Poweredge SC600
 	0220  OSB4/CSB5 OHCI USB Controller
 		4c53 1080  CT8 mainboard
 	0221  CSB6 OHCI USB Controller
+		1734 1012  Primergy RX300
+	0223  HT1000 USB Controller
 	0225  CSB5 LPC bridge
-# cancelled
-		4c53 1080  CT8 mainboard
 	0227  GCLE-2 Host Bridge
+		1734 1012  Primergy RX300
 	0230  CSB5 LPC bridge
 		4c53 1080  CT8 mainboard
+	0234  HT1000 LPC Bridge
 	0240  K2 SATA
 	0241  RAIDCore RC4000
 	0242  RAIDCore BC4000
+	024a  BCM5785 (HT1000) SATA Native SATA Mode
 1167  Mutoh Industries Inc
 1168  Thine Electronics Inc
 1169  Centre for Development of Advanced Computing
@@ -5038,6 +5277,7 @@
 1178  Alfa, Inc.
 	afa1  Fast Ethernet Adapter
 1179  Toshiba America Info Systems
+	0102  Extended IDE Controller
 	0103  EX-IDE Type-B
 	0404  DVD Decoder card
 	0406  Tecra Video Capture device
@@ -5059,6 +5299,9 @@
 117a  A-Trend Technology
 117b  L G Electronics, Inc.
 117c  Atto Technology
+	0030  Ultra320 SCSI Host Adapter
+		117c 8013  ExpressPCI UL4D
+		117c 8014  ExpressPCI UL4S
 117d  Becton & Dickinson
 117e  T/R Systems
 117f  Integrated Circuit Systems
@@ -5085,8 +5328,9 @@
 	0575  R5C575 SD Bus Host Adapter
 	0576  R5C576 SD Bus Host Adapter
 	0592  R5C592 Memory Stick Bus Host Adapter
-	0822  SD Card reader
+	0822  R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter
 		1028 0188  Inspiron 6000 laptop
+	0852  xD-Picture Card Controller
 1181  Telmatics International
 1183  Fujikura Ltd
 1184  Forks Inc
@@ -5102,6 +5346,7 @@
 	1300  RTL8139 Ethernet
 		1186 1300  DFE-538TX 10/100 Ethernet Adapter
 		1186 1301  DFE-530TX+ 10/100 Ethernet Adapter
+		1186 1303  DFE-528TX 10/100 Fast Ethernet PCI Adapter
 	1340  DFE-690TXD CardBus PC Card
 	1541  DFE-680TXD CardBus PC Card
 	1561  DRP-32TXD Cardbus PC Card
@@ -5119,7 +5364,6 @@
 	3a13  AirPlus DWL-G520 Wireless PCI Adapter(rev.B)
 	3a14  AirPremier DWL-AG530 Wireless PCI Adapter
 	3a63  AirXpert DWL-AG660 Wireless Cardbus Adapter
-	3b05  DWL-G650+ CardBus PC Card
 	4000  DL2000-based Gigabit Ethernet
 	4300  DGE-528T Gigabit Ethernet Adapter
 	4c00  Gigabit Ethernet Adapter
@@ -5205,19 +5449,20 @@
 11a9  InnoSys Inc.
 	4240  AMCC S933Q Intelligent Serial Card
 11aa  Actel
-# Formerly Galileo Technology, Inc.
+# Nee Galileo Technology, Inc.
 11ab  Marvell Technology Group Ltd.
 	0146  GT-64010/64010A System Controller
 	138f  W8300 802.11 Adapter (rev 07)
 	1fa6  Marvell W8300 802.11 Adapter
 	1fa7  88W8310 and 88W8000G [Libertas] 802.11g client chipset
+	1faa  88w8335 [Libertas] 802.11b/g Wireless
 	4320  88E8001 Gigabit Ethernet Controller
 		1019 0f38  Marvell 88E8001 Gigabit Ethernet Controller (ECS)
 		1019 8001  Marvell 88E8001 Gigabit Ethernet Controller (ECS)
 		1043 173c  Marvell 88E8001 Gigabit Ethernet Controller (Asus)
 		1043 811a  Marvell 88E8001 Gigabit Ethernet Controller (Asus)
 		105b 0c19  Marvell 88E8001 Gigabit Ethernet Controller (Foxconn)
-		10b8 b452  SMC EZ Card 1000 (SMC9452TXV.2)
+		10b8 b452  EZ Card 1000 (SMC9452TXV.2)
 		11ab 0121  Marvell RDK-8001
 		11ab 0321  Marvell RDK-8003
 		11ab 1021  Marvell RDK-8010
@@ -5272,7 +5517,6 @@
 		1458 e000  Marvell 88E8052 Gigabit Ethernet Controller (Gigabyte)
 		1462 052c  Marvell 88E8052 Gigabit Ethernet Controller (MSI)
 		1849 8052  Marvell 88E8052 Gigabit Ethernet Controller (ASRock)
-		1940 e000  Marvell 88E8052 Gigabit Ethernet Controller (Gigabyte)
 		a0a0 0509  Marvell 88E8052 Gigabit Ethernet Controller (Aopen)
 	4361  88E8050 Gigabit Ethernet Controller
 		107b 3015  Marvell 88E8050 Gigabit Ethernet Controller (Gateway)
@@ -5293,7 +5537,7 @@
 		1297 c242  Marvell 88E8053 Gigabit Ethernet Controller (Shuttle)
 		1297 c243  Marvell 88E8053 Gigabit Ethernet Controller (Shuttle)
 		1297 c244  Marvell 88E8053 Gigabit Ethernet Controller (Shuttle)
-		13d1 ac11  Abocom EGE5K - Giga Ethernet Expresscard
+		13d1 ac11  EGE5K - Giga Ethernet Expresscard
 		1458 e000  Marvell 88E8053 Gigabit Ethernet Controller (Gigabyte)
 		1462 058c  Marvell 88E8053 Gigabit Ethernet Controller (MSI)
 		14c0 0012  Marvell 88E8053 Gigabit Ethernet Controller (Compal)
@@ -5317,7 +5561,6 @@
 		1854 001f  Marvell 88E8053 Gigabit Ethernet Controller (LGE)
 		1854 0021  Marvell 88E8053 Gigabit Ethernet Controller (LGE)
 		1854 0022  Marvell 88E8053 Gigabit Ethernet Controller (LGE)
-		1940 e000  Marvell 88E8053 Gigabit Ethernet Controller (Gigabyte)
 		270f 2801  Marvell 88E8053 Gigabit Ethernet Controller (Chaintech)
 		a0a0 0506  Marvell 88E8053 Gigabit Ethernet Controller (Aopen)
 	4611  GT-64115 System Controller
@@ -5344,7 +5587,8 @@
 		11ad c001  LNE100TX [ver 2.0]
 11ae  Aztech System Ltd
 11af  Avid Technology Inc.
-	0001  [Cinema]
+	0001  Cinema
+	ee40  Digidesign Audiomedia III
 11b0  V3 Semiconductor Inc.
 	0002  V300PSC
 	0292  V292PBC [Am29030/40 Bridge]
@@ -5369,7 +5613,8 @@
 11be  International Microcircuits Inc
 11bf  Astrodesign, Inc.
 11c0  Hewlett Packard
-11c1  Agere Systems (former Lucent Microelectronics)
+# Nee Lucent Microelectronics
+11c1  Agere Systems
 	0440  56k WinModem
 		1033 8015  LT WinModem 56k Data+Fax+Voice+Dsvd
 		1033 8047  LT WinModem 56k Data+Fax+Voice+Dsvd
@@ -5457,6 +5702,7 @@
 	0450  LT WinModem
 		1033 80a8  Versa Note Vxi
 		144f 4005  Magnia SG20
+		4005 144f  LifeBook C Series
 	0451  LT WinModem
 	0452  LT WinModem
 	0453  LT WinModem
@@ -5476,11 +5722,11 @@
 	048f  V.92 56k WinModem
 	5801  USB
 	5802  USS-312 USB Controller
-# 4 port PCI USB Controller made by Agere (formely Lucent)
 	5803  USS-344S USB Controller
 	5811  FW323
 		8086 524c  D865PERL mainboard
 		dead 0800  FireWire Host Bus Adapter
+	8110  T8110 H.100/H.110 TDM switch
 	ab10  WL60010 Wireless LAN MAC
 	ab11  WL60040 Multimode Wireles LAN MAC
 		11c1 ab12  WaveLAN 11abg Cardbus card (Model 1102)
@@ -5524,6 +5770,7 @@
 	1535  Blackfin BF535 processor
 	1805  SM56 PCI modem
 	1889  AD1889 sound chip
+	5340  AD1881 sound chip
 11d5  Ikon Corporation
 	0115  10115
 	0117  10117
@@ -5539,9 +5786,11 @@
 	6057  ZR36057PQC Video cutting chipset
 		1031 7efe  DC10 Plus
 		1031 fc00  MiroVIDEO DC50, Motion JPEG Capture/CODEC Board
+		12f8 8a02  Tekram Video Kit
 		13ca 4231  JPEG/TV Card
 	6120  ZR36120
 		1328 f001  Cinemaster C DVD Decoder
+		1de1 9fff  Video Kit C210
 11df  New Wave PDG
 11e0  Cray Communications A/S
 11e1  GEC Plessey Semi Inc.
@@ -5775,6 +6024,7 @@
 1231  Woodward McCoach, Inc.
 1232  GPT Limited
 1233  Bus-Tech, Inc.
+# Also Bochs uses this for virtual VGA...
 1234  Technical Corp.
 1235  Risq Modular Systems, Inc.
 1236  Sigma Designs Corporation
@@ -5863,6 +6113,7 @@
 125a  ABB Power Systems
 125b  Asix Electronics Corporation
 	1400  ALFA GFC2204 Fast Ethernet
+		1186 1100  AX8814X Based PCI Fast Ethernet Adapter
 125c  Aurora Technologies, Inc.
 	0101  Saturn 4520P
 	0640  Aries 16000P
@@ -5935,6 +6186,8 @@
 		17cf 0020  Z-Com XG-900 and clones Wireless Adapter
 	8130  HMP8130 NTSC/PAL Video Decoder
 	8131  HMP8131 NTSC/PAL Video Decoder
+# This is probably more likely a HW fault, but I am keeping it for now --mj
+	ffff  ISL3886IK
 1261  Matsushita-Kotobuki Electronics Industries, Ltd.
 1262  ES Computer Company, Ltd.
 1263  Sonic Solutions
@@ -5980,6 +6233,7 @@
 		1042 1854  Tazer
 		107b 8054  Tabor2
 		1274 1371  Creative Sound Blaster AudioPCI64V, AudioPCI128
+		1274 8001  CT4751 board
 		1462 6470  ES1371, ES1373 AudioPCI On Motherboard MS-6147 1.1A
 		1462 6560  ES1371, ES1373 AudioPCI On Motherboard MS-6156 1.10
 		1462 6630  ES1371, ES1373 AudioPCI On Motherboard MS-6163BX 1.0A
@@ -6019,6 +6273,7 @@
 		8086 425a  ES1371, ES1373 AudioPCI On Motherboard BZ440ZX
 		8086 4341  ES1371, ES1373 AudioPCI On Motherboard Cayman
 		8086 4343  ES1371, ES1373 AudioPCI On Motherboard Cape Cod
+		8086 4541  D815EEA Motherboard
 		8086 4649  ES1371, ES1373 AudioPCI On Motherboard Fire Island
 		8086 464a  ES1371, ES1373 AudioPCI On Motherboard FJ440ZX
 		8086 4d4f  ES1371, ES1373 AudioPCI On Motherboard Montreal
@@ -6045,6 +6300,8 @@
 	0701  TPE3/TM3 PowerPC Node
 	0710  TPE5 PowerPC PCI board
 1279  Transmeta Corporation
+	0060  TM8000 Northbridge
+	0061  TM8000 AGP bridge
 	0295  Northbridge
 	0395  LongRun Northbridge
 	0396  SDRAM controller
@@ -6260,7 +6517,8 @@
 12b6  Natural Microsystems
 12b7  Cognex Modular Vision Systems Div. - Acumen Inc.
 12b8  Korg
-12b9  3Com Corp, Modem Division (formerly US Robotics)
+# Nee US Robotics
+12b9  3Com Corp, Modem Division
 	1006  WinModem
 		12b9 005c  USR 56k Internal Voice WinModem (Model 3472)
 		12b9 005e  USR 56k Internal WinModem (Models 662975)
@@ -6378,6 +6636,7 @@
 12d6  Analogic Corp
 12d7  Biotronic SRL
 12d8  Pericom Semiconductor
+	8150  PCI to PCI Bridge
 12d9  Aculab PLC
 	0002  PCI Prosody
 	0004  cPCI Prosody
@@ -6478,7 +6737,7 @@
 1304  Juniper Networks
 1305  Netphone, Inc
 1306  Duet Technologies
-# Formerly ComputerBoards
+# Nee ComputerBoards
 1307  Measurement Computing
 	0001  PCI-DAS1602/16
 	000b  PCI-DIO48H
@@ -6517,6 +6776,7 @@
 	004c  PCI-DAS1000
 	004d  PCI-QUAD04
 	0052  PCI-DAS4020/12
+	0054  PCI-DIO96
 	005e  PCI-DAS6025
 1308  Jato Technologies Inc.
 	0001  NetCelerator Adapter
@@ -6702,7 +6962,8 @@
 	0201  GPS167PCI GPS Receiver
 	0202  GPS168PCI GPS Receiver
 	0203  GPS169PCI GPS Receiver
-	0301  TCR510PCI IRIG Receiver
+	0301  TCR510PCI IRIG Timecode Reader
+	0302  TCR167PCI IRIG Timecode Reader
 1361  Soliton Systems K.K.
 1362  Fujifacom Corporation
 1363  Phoenix Technology Ltd
@@ -6795,6 +7056,8 @@
 1397  Cologne Chip Designs GmbH
 	16b8  ISDN network Controller [HFC-8S]
 	2bd0  ISDN network controller [HFC-PCI]
+		0675 1704  ISDN Adapter (PCI Bus, D, C)
+		0675 1708  ISDN Adapter (PCI Bus, D, C, ACPI)
 		1397 2bd0  ISDN Board
 		e4bf 1000  CI1-1-Harp
 1398  Clarion co. Ltd
@@ -6860,10 +7123,10 @@
 	0030  SyncLink Multiport Adapter
 	0210  SyncLink Adapter v2
 13c1  3ware Inc
-	1000  3ware Inc 3ware 5xxx/6xxx-series PATA-RAID
-	1001  3ware Inc 3ware 7xxx/8xxx-series PATA/SATA-RAID
-		13c1 1001  3ware Inc 3ware 7xxx/8xxx-series PATA/SATA-RAID
-	1002  3ware Inc 3ware 9xxx-series SATA-RAID
+	1000  5xxx/6xxx-series PATA-RAID
+	1001  7xxx/8xxx-series PATA/SATA-RAID
+		13c1 1001  7xxx/8xxx-series PATA/SATA-RAID
+	1002  9xxx-series SATA-RAID
 13c2  Technotrend Systemtechnik GmbH
 13c3  Janz Computer AG
 13c4  Phase Metrics
@@ -6952,8 +7215,9 @@
 13fc  Computer Peripherals International
 13fd  Micro Science Inc
 13fe  Advantech Co. Ltd
-	1240  PCI-1240 4-channel stepper motor controller card w.  Nova Electronics MCX314
-	1600  PCI-1612 4-port RS-232/422/485 PCI Communication Card
+	1240  PCI-1240 4-channel stepper motor controller card
+	1600  PCI-1612 4-port RS-232/422/485 PCI communication card
+	1733  PCI-1733 32-channel isolated digital input card
 	1752  PCI-1752
 	1754  PCI-1754
 	1756  PCI-1756
@@ -6999,7 +7263,7 @@
 140f  Salient Systems Corp
 1410  Midas lab Inc
 1411  Ikos Systems Inc
-# formerly IC Ensemble Inc.
+# Nee IC Ensemble Inc.
 1412  VIA Technologies Inc.
 	1712  ICE1712 [Envy24] PCI Multi-Channel I/O Controller
 		1412 1712  Hoontech ST Audio DSP 24
@@ -7047,6 +7311,7 @@
 		15ed 2000  MCCR Serial p4-7 of 8
 		15ed 2001  MCCR Serial p4-15 of 16
 	9521  OX16PCI952 (Dual 16950 UART)
+	9523  OX16PCI952 Integrated Parallel Port
 1416  Multiwave Innovation pte Ltd
 1417  Convergenet Technologies Inc
 1418  Kyushu electronics systems Inc
@@ -7142,7 +7407,6 @@
 	6819  Broadcom Corporation BCM4306 802.11b/g Wireless LAN Controller [MSI CB54G]
 	6825  PCI Card wireless 11g [PC54G]
 	8725  NVIDIA NV25 [GeForce4 Ti 4600] VGA Adapter
-# MSI G4Ti4800, 128MB DDR SDRAM, TV-Out, DVI-I
 	9000  NVIDIA NV28 [GeForce4 Ti 4800] VGA Adapter
 	9110  GeFORCE FX5200
 	9119  NVIDIA NV31 [GeForce FX 5600XT] VGA Adapter
@@ -7202,6 +7466,7 @@
 1495  TOKAI Communications Industry Co. Ltd
 1496  JOYTECH Computer Co., Ltd.
 1497  SMA Regelsysteme GmBH
+	1497  SMA Technologie AG
 1498  TEWS Datentechnik GmBH
 	30c8  TPCI200
 1499  EMTEC CO., Ltd
@@ -7368,13 +7633,14 @@
 		0e11 009a  NC7770 Gigabit Server Adapter (PCI-X, 10/100/1000-T)
 		0e11 00c1  NC6770 Gigabit Server Adapter (PCI-X, 1000-SX)
 		1028 0121  Broadcom BCM5701 1000Base-T
-		103c 128a  HP 1000Base-T (PCI) [A7061A]
-		103c 128b  HP 1000Base-SX (PCI) [A7073A]
-		103c 12a4  HP Core Lan 1000Base-T
-		103c 12c1  HP IOX Core Lan 1000Base-T [A7109AX]
-		10a9 8010  SGI IO9 Gigabit Ethernet (Copper)
-		10a9 8011  SGI Gigabit Ethernet (Copper)
-		10a9 8012  SGI Gigabit Ethernet (Fiber)
+		103c 128a  1000Base-T (PCI) [A7061A]
+		103c 128b  1000Base-SX (PCI) [A7073A]
+		103c 12a4  Core Lan 1000Base-T
+		103c 12c1  IOX Core Lan 1000Base-T [A7109AX]
+		103c 1300  Core LAN/SCSI Combo [A6794A]
+		10a9 8010  IO9 Gigabit Ethernet (Copper)
+		10a9 8011  Gigabit Ethernet (Copper)
+		10a9 8012  Gigabit Ethernet (Fiber)
 		10b7 1004  3C996-SX 1000Base-SX
 		10b7 1006  3C996B-T 1000Base-T
 		10b7 1007  3C1000-T 1000Base-T
@@ -7405,6 +7671,7 @@
 		10b7 2000  3C998-T Dual Port 10/100/1000 PCI-X
 		10b7 3000  3C999-T Quad Port 10/100/1000 PCI-X
 		1166 1648  NetXtreme CIOB-E 1000Base-T
+		1734 100b  Primergy RX300
 	164a  NetXtreme II BCM5706 Gigabit Ethernet
 	164d  NetXtreme BCM5702FE Gigabit Ethernet
 	1653  NetXtreme BCM5705 Gigabit Ethernet
@@ -7412,15 +7679,25 @@
 	1654  NetXtreme BCM5705_2 Gigabit Ethernet
 		0e11 00e3  NC7761 Gigabit Server Adapter
 		103c 3100  NC1020 HP ProLiant Gigabit Server Adapter 32 PCI
+		103c 3101  NC370T Multifunction Gigabit Server Adapter
+		103c 3102  NC370F Multifunction Gigabit Server Adapter
+		103c 3226  NC150T 4-port Gigabit Combo Switch & Adapter
 	1659  NetXtreme BCM5721 Gigabit Ethernet PCI Express
+		103c 7031  NC320T PCIe Gigabit Server Adapter
+		103c 7032  NC320i PCIe Gigabit Server Adapter
+		1734 1061  Primergy RX300 S2
 	165d  NetXtreme BCM5705M Gigabit Ethernet
+		1028 865d  Latitude D400
 	165e  NetXtreme BCM5705M_2 Gigabit Ethernet
 		103c 088c  nc8000 laptop
 		103c 0890  nc6000 laptop
+	166a  NetXtreme BCM5780 Gigabit Ethernet
+	166b  NetXtreme BCM5780S Gigabit Ethernet
 	166e  570x 10/100 Integrated Controller
 	1677  NetXtreme BCM5751 Gigabit Ethernet PCI Express
 		1028 0179  Optiplex GX280
 		1028 0182  Latitude D610
+		1734 105d  Scenic W620
 	167d  NetXtreme BCM5751M Gigabit Ethernet PCI Express
 	167e  NetXtreme BCM5751F Fast Ethernet PCI Express
 	1696  NetXtreme BCM5782 Gigabit Ethernet
@@ -7450,8 +7727,8 @@
 	16c7  NetXtreme BCM5703 Gigabit Ethernet
 		0e11 00ca  NC7771 Gigabit Server Adapter (PCI-X, 10,100,1000-T)
 		0e11 00cb  NC7781 Gigabit Server Adapter (PCI-X, 10,100,1000-T)
-		103c 12c3  HP Combo FC/GigE-SX [A9782A]
-		103c 12ca  HP Combo FC/GigE-T [A9784A]
+		103c 12c3  Combo FC/GigE-SX [A9782A]
+		103c 12ca  Combo FC/GigE-T [A9784A]
 		14e4 0009  NetXtreme BCM5703 1000Base-T
 		14e4 000a  NetXtreme BCM5703 1000Base-SX
 	16dd  NetLink BCM5781 Gigabit Ethernet PCI Express
@@ -7460,6 +7737,8 @@
 	16fe  NetXtreme BCM5753F Fast Ethernet PCI Express
 	170c  BCM4401-B0 100Base-TX
 		1028 0188  Inspiron 6000 laptop
+		1028 0196  Inspiron 5160
+		103c 099c  nx6110
 	170d  NetXtreme BCM5901 100Base-TX
 		1014 0545  ThinkPad R40e (2684-HVG) builtin ethernet controller
 	170e  NetXtreme BCM5901 100Base-TX
@@ -7478,12 +7757,18 @@
 	4312  BCM4310 UART
 	4313  BCM4310 Ethernet Controller
 	4315  BCM4310 USB Controller
+	4318  BCM4318 [AirForce One 54g] 802.11g Wireless LAN Controller
+		1468 0311  Aspire 3022WLMi
+		14e4 0449  Gateway 7510GX
 	4320  BCM4306 802.11b/g Wireless LAN Controller
 		1028 0001  TrueMobile 1300 WLAN Mini-PCI Card
 		1028 0003  Wireless 1350 WLAN Mini-PCI Card
 		1043 100f  WL-100G
+		1057 7025  WN825G
+		106b 004e  AirPort Extreme
 		14e4 4320  Linksys WMP54G PCI
 		1737 4320  WPC54G
+		1799 7001  Belkin F5D7001 High-Speed Mode Wireless G Network Card
 		1799 7010  Belkin F5D7010 54g Wireless Network card
 	4321  BCM4306 802.11a Wireless LAN Controller
 	4322  BCM4306 UART
@@ -7535,6 +7820,7 @@
 	5680  BCM5680 G-Switch 8 Port Gigabit Ethernet Switch Controller
 	5690  BCM5690 12-port Multi-Layer Gigabit Ethernet Switch
 	5691  BCM5691 GE/10GE 8+2 Gigabit Ethernet Switch Controller
+	5692  BCM5692 12-port Multi-Layer Gigabit Ethernet Switch
 	5820  BCM5820 Crypto Accelerator
 	5821  BCM5821 Crypto Accelerator
 	5822  BCM5822 Crypto Accelerator
@@ -7551,6 +7837,7 @@
 14ea  Planex Communications, Inc
 	ab06  FNW-3603-TX CardBus Fast Ethernet
 	ab07  RTL81xx RealTek Ethernet
+	ab08  FNW-3602-TX CardBus Fast Ethernet
 14eb  SEIKO EPSON Corp
 14ec  ACQIRIS
 14ed  DATAKINETICS Ltd
@@ -7627,12 +7914,13 @@
 		122d 4302  Dell MP3930V-W(C) MiniPCI
 	1610  ADSL AccessRunner PCI Arbitration Device
 	1611  AccessRunner PCI ADSL Interface Device
-	1620  ADSL AccessRunner V2 PCI Arbitration Device
+	1620  AccessRunner V2 PCI ADSL Arbitration Device
 	1621  AccessRunner V2 PCI ADSL Interface Device
 	1622  AccessRunner V2 PCI ADSL Yukon WAN Adapter
 	1803  HCF 56k Modem
 		0e11 0023  623-LAN Grizzly
 		0e11 0043  623-LAN Yogi
+	1811  Conextant MiniPCI Network Adapter
 	1815  HCF 56k Modem
 		0e11 0022  Grizzly
 		0e11 0042  Yogi
@@ -7695,12 +7983,60 @@
 		14f1 2004  Dynalink 56PMi
 	2f02  HSF 56k HSFi Data/Fax
 	2f11  HSF 56k HSFi Modem
+	2f20  HSF 56k Data/Fax Modem
 	8234  RS8234 ATM SAR Controller [ServiceSAR Plus]
 	8800  CX23880/1/2/3 PCI Video and Audio Decoder
+		0070 2801  Hauppauge WinTV 28xxx (Roslyn) models
+		0070 3401  Hauppauge WinTV 34xxx models
+		0070 9002  Hauppauge Nova-T DVB-T
+		1002 00f8  ATI TV Wonder Pro
+		1043 4823  ASUS PVR-416
+		107d 6613  Leadtek Winfast 2000XP Expert
+		107d 6620  Leadtek Winfast DV2000
+		107d 663c  Leadtek PVR 2000
+		10fc d003  IODATA GV-VCP3/PCI
+		10fc d035  IODATA GV/BCTV7E
+		1461 000b  AverTV Studio 303 (M126)
+		1462 8606  MSI TV-@nywhere Master
+		14c7 0107  GDI Black Gold
+		14f1 0187  Conexant DVB-T reference design
+		14f1 0342  Digital-Logic MICROSPACE Entertainment Center (MEC)
+		1540 2580  Provideo PV259
+		1554 4811  PixelView
 		17de 08a1  XPert DVB-T PCI BDA DVBT 23880 Video Capture
+		17de 08a6  KWorld/VStream XPert DVB-T
+		17de a8a6  digitalnow DNTV Live! DVB-T
+		18ac d500  DViCO FusionHDTV5 Gold
+		18ac d810  DViCO FusionHDTV3 Gold-Q
+		18ac d820  DViCO FusionHDTV3 Gold-T
+		18ac db00  DVICO FusionHDTV DVB-T1
+		18ac db10  DVICO FusionHDTV DVB-T Plus
+		7063 3000  pcHDTV HD3000 HDTV
 	8801  CX23880/1/2/3 PCI Video and Audio Decoder [Audio Port]
+		0070 2801  Hauppauge WinTV 28xxx (Roslyn) models
 	8802  CX23880/1/2/3 PCI Video and Audio Decoder [MPEG Port]
-		17de 08a1  Xpert DVB-T PCI 2388x Transport Stream Capture
+		0070 2801  Hauppauge WinTV 28xxx (Roslyn) models
+		0070 9002  Nova-T DVB-T Model 909
+		1043 4823  ASUS PVR-416
+		107d 663c  Leadtek PVR 2000
+		14f1 0187  Conexant DVB-T reference design
+		17de 08a1  XPert DVB-T PCI BDA DVBT 23880 Transport Stream Capture
+		17de 08a6  KWorld/VStream XPert DVB-T
+		18ac d500  DViCO FusionHDTV5 Gold
+		18ac d810  DViCO FusionHDTV3 Gold-Q
+		18ac d820  DViCO FusionHDTV3 Gold-T
+		18ac db00  DVICO FusionHDTV DVB-T1
+		18ac db10  DVICO FusionHDTV DVB-T Plus
+		7063 3000  pcHDTV HD3000 HDTV
+	8804  CX23880/1/2/3 PCI Video and Audio Decoder [IR Port]
+		0070 9002  Nova-T DVB-T Model 909
+	8811  CX23880/1/2/3 PCI Video and Audio Decoder [Audio Port]
+		0070 3401  Hauppauge WinTV 34xxx models
+		1462 8606  MSI TV-@nywhere Master
+		18ac d500  DViCO FusionHDTV5 Gold
+		18ac d810  DViCO FusionHDTV3 Gold-Q
+		18ac d820  DViCO FusionHDTV3 Gold-T
+		18ac db00  DVICO FusionHDTV DVB-T1
 14f2  MOBILITY Electronics
 	0120  EV1000 bridge
 	0121  EV1000 Parallel port
@@ -7792,11 +8128,12 @@
 		1522 0800  RockForceOCTO+ 8 Port V.92/V.44 Data/Fax/Voice Modem
 		1522 0c00  RockForceDUO+ 2 Port V.92/V.44 Data, V.34 Super-G3 Fax, Voice Modem
 		1522 0d00  RockForceQUATRO+ 4 Port V.92/V.44 Data, V.34 Super-G3 Fax, Voice Modem
-# this is a correction to a recent entry. 1522:0E00 should be 1522:1D00
 		1522 1d00  RockForceOCTO+ 8 Port V.92/V.44 Data, V.34 Super-G3 Fax, Voice Modem
 1523  MUSIC Semiconductors
 1524  ENE Technology Inc
 	0510  CB710 Memory Card Reader Controller
+	0530  ENE PCI Memory Stick Card Reader Controller
+	0550  ENE PCI Secure Digital Card Reader Controller
 	0610  PCI Smart Card Reader Controller
 	1211  CB1211 Cardbus Controller
 	1225  CB1225 Cardbus Controller
@@ -7837,7 +8174,8 @@
 153c  ANTAL Electronic
 153d  FILANET Corp
 153e  TECHWELL Inc
-153f  MIPS DENMARK
+153f  MIPS Technologies, Inc.
+	0001  SOC-it 101 System Controller
 1540  PROVIDEO MULTIMEDIA Co Ltd
 1541  MACHONE Communications
 1542  VIVID Technology Inc
@@ -7990,8 +8328,8 @@
 	5a44  MT23108 InfiniHost
 	5a45  MT23108 [Infinihost HCA Flash Recovery]
 	5a46  MT23108 PCI Bridge
-	5e8c  MT24204 [InfiniHost III Lx HCA]
-	5e8d  MT24204 [InfiniHost III Lx HCA Flash Recovery]
+	5e8d  MT25204 [InfiniHost III Lx HCA Flash Recovery]
+	6274  MT25204 [InfiniHost III Lx HCA]
 	6278  MT25208 InfiniHost III Ex (Tavor compatibility mode)
 	6279  MT25208 [InfiniHost III Ex HCA Flash Recovery]
 	6282  MT25208 InfiniHost III Ex
@@ -8004,6 +8342,7 @@
 15ba  Impacct Technology Corp
 15bb  Portwell Inc
 15bc  Agilent Technologies
+	1100  E8001-66442 PCI Express CIC
 	2922  64 Bit, 133MHz PCI-X Exerciser & Protocol Checker
 	2928  64 Bit, 66MHz PCI Exerciser & Analyzer
 	2929  64 Bit, 133MHz PCI-X Analyzer & Exerciser
@@ -8094,7 +8433,11 @@
 1619  FarSite Communications Ltd
 	0400  FarSync T2P (2 port X.21/V.35/V.24)
 	0440  FarSync T4P (4 port X.21/V.35/V.24)
-# www.rioworks.com
+	0610  FarSync T1U (1 port X.21/V.35/V.24)
+	0620  FarSync T2U (1 port X.21/V.35/V.24)
+	0640  FarSync T4U (4 port X.21/V.35/V.24)
+	1610  FarSync TE1 (T1,E1)
+	2610  FarSync DSL-S1 (SHDSL)
 161f  Rioworks
 1626  TDK Semiconductor Corp.
 	8410  RTL81xx Fast Ethernet
@@ -8131,8 +8474,7 @@
 	2102  ZyDAS ZD1202
 		187e 3406  ZyAIR B-122 CardBus 11Mbs Wireless LAN Card
 1681  Hercules
-# More specs, more accurate desc.
-	0010  Hercules 3d Prophet II Ultra 64MB [ 350 MHz NV15BR core, 128-bit DDR @ 460 MHz, 1.5v AGP4x  ]
+	0010  Hercules 3d Prophet II Ultra 64MB (350 MHz NV15BR core)
 1682  XFX Pine Group Inc.
 1688  CastleNet Technology Inc.
 	1170  WLAN 802.11b card
@@ -8154,9 +8496,11 @@
 		168c 2026  Netgate 5354MP ARIES a(108Mb turbo)/b/g MiniPCI Adapter
 		168c 2041  Netgate 5354MP Plus ARIES2 b/g MiniPCI Adapter
 		168c 2042  Netgate 5354MP Plus ARIES2 a/b/g MiniPCI Adapter
+		16ab 7302  Trust Speedshare Turbo Pro Wireless PCI Adapter
 	1014  AR5212 802.11abg NIC
+1695  EPoX Computer Co., Ltd.
 169c  Netcell Corporation
-	0044  SyncRAID SR3000/5000 Series SATA RAID Controllers
+	0044  Revolution Storage Processing Card
 16a5  Tekram Technology Co.,Ltd.
 16ab  Global Sun Technology Inc
 	1100  GL24110P
@@ -8173,7 +8517,6 @@
 	0001  Rocket Drive DL
 16cd  Densitron Technologies
 16ce  Roland Corp.
-# www.pikatechnologies.com
 16df  PIKA Technologies Inc.
 16e3  European Space Agency
 	1e0f  LEON2FT Processor
@@ -8187,7 +8530,6 @@
 16f4  Vweb Corp
 	8000  VW2010
 16f6  VideoTele.com, Inc.
-# www.internetmachines.com
 1702  Internet Machines Corporation (IMC)
 1705  Digital First, Inc.
 170b  NetOctave
@@ -8197,12 +8539,14 @@
 1725  Vitesse Semiconductor
 	7174  VSC7174 PCI/PCI-X Serial ATA Host Bus Controller
 172a  Accelerated Encryption
+	13c8  AEP SureWare Runner 1000V3
 1734  Fujitsu Siemens Computer GmbH
 1737  Linksys
 	0013  WMP54G Wireless Pci Card
 	0015  WMP54GS Wireless Pci Card
 	1032  Gigabit Network Adapter
 		1737 0015  EG1032 v2 Instant Gigabit Network Adapter
+		1737 0024  EG1032 v3 Instant Gigabit Network Adapter
 	1064  Gigabit Network Adapter
 		1737 0016  EG1064 v2 Instant Gigabit Network Adapter
 	ab08  21x4x DEC-Tulip compatible 10/100 Ethernet
@@ -8239,6 +8583,7 @@
 17a0  Genesys Logic, Inc
 	8033  GL880S USB 1.1 controller
 	8034  GL880S USB 2.0 controller
+17aa  Lenovo
 17af  Hightech Information System Ltd.
 17b3  Hawking Technologies
 	ab08  PN672TX 10/100 Ethernet
@@ -8246,8 +8591,10 @@
 	0011  WebEnhance 100 GZIP Compression Card
 17c0  Wistron Corp.
 17c2  Newisys, Inc.
+17cb  Airgo Networks Inc
 17cc  NetChip Technology, Inc
 	2280  USB 2.0
+17cf  Z-Com, Inc.
 17d3  Areca Technology Corp.
 	1110  ARC-1110 4-Port PCI-X to SATA RAID Controller
 	1120  ARC-1120 8-Port PCI-X to SATA RAID Controller
@@ -8257,17 +8604,17 @@
 	1220  ARC-1220 8-Port PCI-Express to SATA RAID Controller
 	1230  ARC-1230 12-Port PCI-Express to SATA RAID Controller
 	1260  ARC-1260 16-Port PCI-Express to SATA RAID Controller
-# S2io ships 10Gb PCI-X Ethernet adapters www.s2io.com
 17d5  S2io Inc.
 	5831  Xframe 10 Gigabit Ethernet PCI-X
 		103c 12d5  HP PCI-X 133MHz 10GbE SR Fiber
 17de  KWorld Computer Co. Ltd.
-# http://www.connect3d.com
 17ee  Connect Components Ltd
+17f2  Albatron Corp.
 17fe  Linksys, A Division of Cisco Systems
 	2120  WMP11v4 802.11b PCI card
 	2220  [AirConn] INPROCOMM IPN 2220 Wireless LAN Adapter (rev 01)
 		17fe 2220  WPC54G ver. 4
+17ff  Benq Corporation
 1813  Ambient Technologies Inc
 	4000  HaM controllerless modem
 		16be 0001  V9x HAM Data Fax Modem
@@ -8275,7 +8622,7 @@
 		16be 0002  V9x HAM 1394
 1814  RaLink
 	0101  Wireless PCI Adpator RT2400 / RT2460
-		3306 1113  Quidway WL100M
+		1043 0127  WiFi-b add-on Card
 	0201  Ralink RT2500 802.11 Cardbus Reference Card
 		1371 001e  CWC-854 Wireless-G CardBus Adapter
 		1371 001f  CWM-854 Wireless-G Mini PCI Adapter
@@ -8285,6 +8632,7 @@
 		185f 22a0  CN-WF513 Wireless Cardbus Adapter
 1820  InfiniCon Systems Inc.
 1822  Twinhan Technology Co. Ltd
+	4e35  Mantis DTV PCI Bridge Controller [Ver 1.0]
 182d  SiteCom Europe BV
 # HFC-based ISDN card
 	3069  ISDN PCI DC-105V2
@@ -8297,6 +8645,8 @@
 1849  ASRock Incorporation
 1851  Microtune, Inc.
 1852  Anritsu Corp.
+1854  LG Electronics, Inc.
+185b  Compro Technology, Inc.
 185f  Wistron NeWeb Corp.
 1867  Topspin Communications
 	5a44  MT23108 PCI-X HCA
@@ -8310,24 +8660,27 @@
 	0601  VSM2 dual PMC carrier
 	0710  VS14x series PowerPC PCI board
 	0720  VS24x series PowerPC PCI board
-# found e.g. on KNC DVB-S card
 1894  KNC One
 1896  B&B Electronics Manufacturing Company, Inc.
 18a1  Astute Networks Inc.
 18ac  DViCO Corporation
+	d500  FusionHDTV 5
 	d810  FusionHDTV 3 Gold
+	d820  FusionHDTV 3 Gold-T
 18b8  Ammasso
 	b001  AMSO 1100 iWARP/RDMA Gigabit Ethernet Coprocessor
 18bc  Info-Tek Corp.
-# assigned to Octigabay System, which has been acquired by Cray
+# Nee Octigabay System
 18c8  Cray Inc
 18c9  ARVOO Engineering BV
 18ca  XGI - Xabre Graphics Inc
 	0020  Volari Z7
-	0040  Volari V8
+	0040  Volari V3XT/V5/V8
 18d2  Sitecom
 # Sitecom HFC-S based ISDN controller card DC-105v2
 	3069  DC-105v2 ISDN controller
+18dd  Artimi Inc
+	4c6f  Artimi RTMI-100 UWB adapter
 18e6  MPL AG
 	0001  OSCI [Octal Serial Communication Interface]
 18f7  Commtech, Inc.
@@ -8338,12 +8691,13 @@
 	000a  Fastcom 232/4-PCI-335
 18fb  Resilience Corporation
 1924  Level 5 Networks Inc.
+1931  Option N.V.
 1966  Orad Hi-Tec Systems
 	1975  DVG64 family
 1993  Innominate Security Technologies AG
-# http://www.progeny.net
 19ae  Progeny Systems Corporation
 	0520  4135 HFT Interface Controller
+19d4  Quixant Limited
 1a08  Sierra semiconductor
 	0000  SC15064
 1b13  Jaton Corp
@@ -8358,6 +8712,8 @@
 	dc29  DC290
 1fc0  Tumsan Oy
 	0300  E2200 Dual E1/Rawpipe Card
+1fc1  PathScale, Inc
+	000d  InfiniPath HT-400
 2000  Smart Link Ltd.
 2001  Temporal Research Ltd
 2003  Smart Link Ltd.
@@ -8401,14 +8757,20 @@
 3d3d  3DLabs
 	0001  GLINT 300SX
 	0002  GLINT 500TX
+		0000 0000  GLoria L
 	0003  GLINT Delta
+		0000 0000  GLoria XL
 	0004  Permedia
 	0005  Permedia
 	0006  GLINT MX
+		0000 0000  GLoria XL
+		1048 0a42  GLoria XXL
 	0007  3D Extreme
 	0008  GLINT Gamma G1
+		1048 0a42  GLoria XXL
 	0009  Permedia II 2D+3D
 		1040 0011  AccelStar II
+		1048 0a42  GLoria XXL
 		13e9 1000  6221L-4U
 		3d3d 0100  AccelStar II 3D Accelerator
 		3d3d 0111  Permedia 3:16
@@ -8427,7 +8789,6 @@
 	0012  GLint R5 rev A
 	0013  GLint R5 rev B
 	0020  VP10 visual processor
-# P10 generic II
 	0022  VP10 visual processor
 	0024  VP9 visual processor
 	0100  Permedia II 2D+3D
@@ -8594,7 +8955,7 @@
 	8a22  Savage 4
 		1033 8068  Savage 4
 		1033 8069  Savage 4
-		1033 8110  Savage4 LT
+		1033 8110  Savage 4 LT
 		105d 0018  SR9 8Mb SDRAM
 		105d 002a  SR9 Pro 16Mb SDRAM
 		105d 003a  SR9 Pro 32Mb SDRAM
@@ -8674,13 +9035,13 @@
 5700  Netpower
 5851  Exacq Technologies
 6356  UltraStor
-# Better stay within ASCII
 6374  c't Magazin fuer Computertechnik
 	6773  GPPCI
 6409  Logitec Corp.
 6666  Decision Computer International Co.
 	0001  PCCOM4
 	0002  PCCOM8
+	0004  PCCOM2
 7063  pcHDTV
 	2000  HD-2000
 	3000  HD-3000
@@ -8695,7 +9056,6 @@
 8086  Intel Corporation
 	0007  82379AB
 	0008  Extended Express System Support Controller
-		0008 1000  WorldMark 4300 INCA ASIC
 	0039  21145 Fast Ethernet
 	0122  82437FX
 	0309  80303 I/O Processor PCI-to-PCI Bridge
@@ -8705,24 +9065,20 @@
 	0329  6700PXH PCI Express-to-PCI Bridge A
 	032a  6700PXH PCI Express-to-PCI Bridge B
 	032c  6702PXH PCI Express-to-PCI Bridge A
-# A-segment bridge
-	0330  80332 [Dobson] I/O processor
-# A-segment IOAPIC
-	0331  80332 [Dobson] I/O processor
-# B-segment bridge
-	0332  80332 [Dobson] I/O processor
-# B-segment IOAPIC
-	0333  80332 [Dobson] I/O processor
-# Address Translation Unit (ATU)
-	0334  80332 [Dobson] I/O processor
-# PCI-X bridge
-	0335  80331 [Lindsay] I/O processor
-# Address Translation Unit (ATU)
-	0336  80331 [Lindsay] I/O processor
-# A-segment bridge
-	0340  41210 [Lanai] Serial to Parallel PCI Bridge
-# B-segment bridge
-	0341  41210 [Lanai] Serial to Parallel PCI Bridge
+	0330  80332 [Dobson] I/O processor (A-Segment Bridge)
+	0331  80332 [Dobson] I/O processor (A-Segment IOAPIC)
+	0332  80332 [Dobson] I/O processor (B-Segment Bridge)
+	0333  80332 [Dobson] I/O processor (B-Segment IOAPIC)
+	0334  80332 [Dobson] I/O processor (ATU)
+	0335  80331 [Lindsay] I/O processor (PCI-X Bridge)
+	0336  80331 [Lindsay] I/O processor (ATU)
+	0340  41210 [Lanai] Serial to Parallel PCI Bridge (A-Segment Bridge)
+	0341  41210 [Lanai] Serial to Parallel PCI Bridge (B-Segment Bridge)
+	0370  80333 Segment-A PCI Express-to-PCI Express Bridge
+	0371  80333 A-Bus IOAPIC
+	0372  80333 Segment-B PCI Express-to-PCI Express Bridge
+	0373  80333 B-Bus IOAPIC
+	0374  80333 Address Translation Unit
 	0482  82375EB/SB PCI to EISA Bridge
 	0483  82424TX/ZX [Saturn] CPU to PCI bridge
 	0484  82378ZB/IB, 82379AB (SIO, SIO.A) PCI to ISA Bridge
@@ -8805,22 +9161,28 @@
 		1014 0265  PRO/1000 MT Network Connection
 		1014 0267  PRO/1000 MT Network Connection
 		1014 026a  PRO/1000 MT Network Connection
+		1024 0134  Poweredge SC600
 		1028 002e  Optiplex GX260
 		1028 0151  PRO/1000 MT Network Connection
 		107b 8920  PRO/1000 MT Desktop Adapter
 		8086 001e  PRO/1000 MT Desktop Adapter
 		8086 002e  PRO/1000 MT Desktop Adapter
+		8086 1376  PRO/1000 GT Desktop Adapter
+		8086 1476  PRO/1000 GT Desktop Adapter
 	100f  82545EM Gigabit Ethernet Controller (Copper)
 		1014 0269  iSeries 1000/100/10 Ethernet Adapter
 		1014 028e  PRO/1000 MT Network Connection
 		8086 1000  PRO/1000 MT Network Connection
 		8086 1001  PRO/1000 MT Server Adapter
 	1010  82546EB Gigabit Ethernet Controller (Copper)
+		0e11 00db  NC7170 Gigabit Server Adapter
 		1014 027c  PRO/1000 MT Dual Port Network Adapter
 		18fb 7872  RESlink-X
+		1fc1 0026  Niagara 2260 Bypass Card
 		4c53 1080  CT8 mainboard
 		4c53 10a0  CA3/CR3 mainboard
 		8086 1011  PRO/1000 MT Dual Port Server Adapter
+		8086 1012  Primergy RX300
 		8086 101a  PRO/1000 MT Dual Port Network Adapter
 		8086 3424  SE7501HG2 Mainboard
 	1011  82545EM Gigabit Ethernet Controller (Fiber)
@@ -8828,6 +9190,7 @@
 		8086 1002  PRO/1000 MF Server Adapter
 		8086 1003  PRO/1000 MF Server Adapter (LX)
 	1012  82546EB Gigabit Ethernet Controller (Fiber)
+		0e11 00dc  NC6170 Gigabit Server Adapter
 		8086 1012  PRO/1000 MF Dual Port Server Adapter
 	1013  82541EI Gigabit Ethernet Controller (Copper)
 		8086 0013  PRO/1000 MT Network Connection
@@ -8841,7 +9204,6 @@
 		8086 1016  PRO/1000 MT Mobile Connection
 	1017  82540EP Gigabit Ethernet Controller (LOM)
 		8086 1017  PR0/1000 MT Desktop Connection
-# Update controller name from 82541EP to 82541EI
 	1018  82541EI Gigabit Ethernet Controller
 		8086 1018  PRO/1000 MT Desktop Adapter
 	1019  82547EI Gigabit Ethernet Controller (LOM)
@@ -8850,6 +9212,7 @@
 		8086 1019  PRO/1000 CT Desktop Connection
 		8086 301f  D865PERL mainboard
 		8086 3427  S875WP1-E mainboard
+	101a  82547EI Gigabit Ethernet Controller (Mobile)
 	101d  82546EB Gigabit Ethernet Controller
 		8086 1000  PRO/1000 MT Quad Port Server Adapter
 	101e  82540EP Gigabit Ethernet Controller (Mobile)
@@ -8857,11 +9220,13 @@
 		1179 0001  PRO/1000 MT Mobile Connection
 		8086 101e  PRO/1000 MT Mobile Connection
 	1026  82545GM Gigabit Ethernet Controller
+		1028 0169  Precision 470
 		8086 1000  PRO/1000 MT Server Connection
 		8086 1001  PRO/1000 MT Server Adapter
 		8086 1002  PRO/1000 MT Server Adapter
 		8086 1026  PRO/1000 MT Server Connection
 	1027  82545GM Gigabit Ethernet Controller
+		103c 3103  NC310F PCI-X Gigabit Server Adapter
 		8086 1001  PRO/1000 MF Server Adapter(LX)
 		8086 1002  PRO/1000 MF Server Adapter(LX)
 		8086 1003  PRO/1000 MF Server Adapter(LX)
@@ -8907,29 +9272,24 @@
 		8086 302f  Desktop Board D865GBF
 		8086 3427  S875WP1-E mainboard
 	1051  82801EB/ER (ICH5/ICH5R) integrated LAN Controller
+	1052  PRO/100 VM Network Connection
+	1053  PRO/100 VM Network Connection
 	1059  82551QM Ethernet Controller
-# ICH-6 Component
 	1064  82562ET/EZ/GT/GZ - PRO/100 VE (LOM) Ethernet Controller
-# ICH-6 Component
 	1065  82562ET/EZ/GT/GZ - PRO/100 VE Ethernet Controller
-# ICH-6 Component
 	1066  82562 EM/EX/GX - PRO/100 VM (LOM) Ethernet Controller
-# ICH-6 Component
 	1067  82562 EM/EX/GX - PRO/100 VM Ethernet Controller
-# ICH-6 Component
 	1068  82562ET/EZ/GT/GZ - PRO/100 VE (LOM) Ethernet Controller Mobile
-# ICH-6 Component
-	1069  82562 EM/EX/GX - PRO/100 VM (LOM) Ethernet Controller Mobile
-# ICH-6 Component
-	106a  82562G \t- PRO/100 VE (LOM) Ethernet Controller
-# ICH-6 Component
-	106b  82562G \t- PRO/100 VE Ethernet Controller Mobile
+	1069  82562EM/EX/GX - PRO/100 VM (LOM) Ethernet Controller Mobile
+	106a  82562G - PRO/100 VE (LOM) Ethernet Controller
+	106b  82562G - PRO/100 VE Ethernet Controller Mobile
 	1075  82547GI Gigabit Ethernet Controller
 		1028 0165  PowerEdge 750
 		8086 0075  PRO/1000 CT Network Connection
 		8086 1075  PRO/1000 CT Network Connection
 	1076  82541GI/PI Gigabit Ethernet Controller
 		1028 0165  PowerEdge 750
+		1028 019a  PowerEdge SC1425
 		8086 0076  PRO/1000 MT Network Connection
 		8086 1076  PRO/1000 MT Network Connection
 		8086 1176  PRO/1000 MT Desktop Adapter
@@ -8943,6 +9303,7 @@
 	1079  82546GB Gigabit Ethernet Controller
 		103c 12a6  HP Dual Port 1000Base-T [A9900A]
 		103c 12cf  HP Core Dual Port 1000Base-T [AB352A]
+		1fc1 0027  Niagara 2261 Failover NIC
 		4c53 1090  Cx9 / Vx9 mainboard
 		4c53 10b0  CL9 mainboard
 		8086 0079  PRO/1000 MT Dual Port Network Connection
@@ -8956,6 +9317,8 @@
 	107b  82546GB Gigabit Ethernet Controller
 		8086 007b  PRO/1000 MB Dual Port Server Connection
 		8086 107b  PRO/1000 MB Dual Port Server Connection
+	107c  82541PI Gigabit Ethernet Controller
+	1080  FA82537EP 56K V.92 Data/Fax Modem PCI
 	1081  Enterprise Southbridge LAN Copper
 	1082  Enterprise Southbridge LAN fiber
 	1083  Enterprise Southbridge LAN SERDES
@@ -8964,9 +9327,14 @@
 	1086  Enterprise Southbridge IPMI/KCS0
 	1087  Enterprise Southbridge UHCI Redirection
 	1089  Enterprise Southbridge BT
+	108a  82546EB Gigabit Ethernet Controller
+	108b  82573V Gigabit Ethernet Controller (Copper)
+	108c  82573E Gigabit Ethernet Controller (Copper)
 	1096  Enterprise Southbridge DPT LAN Copper
 	1097  Enterprise Southbridge DPT LAN fiber
 	1098  Enterprise Southbridge DPT LAN SERDES
+	1099  82546GB Quad Port Server Adapter
+	109a  82573L Gigabit Ethernet Controller
 	1107  PRO/1000 MF Server Adapter (LX)
 	1130  82815 815 Chipset Host Bridge and Memory Controller Hub
 		1025 1016  Travelmate 612 TX
@@ -8979,6 +9347,7 @@
 		1025 1016  Travelmate 612 TX
 		104d 80df  Vaio PCG-FX403
 		8086 4532  D815EEA2 Mainboard
+		8086 4541  D815EEA Motherboard
 		8086 4557  D815EGEW Mainboard
 	1161  82806AA PCI64 Hub Advanced Programmable Interrupt Controller
 		8086 1161  82806AA PCI64 Hub APIC
@@ -9051,9 +9420,11 @@
 		103c 10e3  NetServer 10/100TX
 		103c 10e4  NetServer 10/100TX
 		103c 1200  NetServer 10/100TX
+		108e 10cf  EtherExpress PRO/100(B)
 		10c3 1100  SmartEther100 SC1100
 		10cf 1115  8255x-based Ethernet Adapter (10/100)
 		10cf 1143  8255x-based Ethernet Adapter (10/100)
+		110a 008b  82551QM Fast Ethernet Multifuction PCI/CardBus Controller
 		1179 0001  8255x-based Ethernet Adapter (10/100)
 		1179 0002  PCI FastEther LAN on Docker
 		1179 0003  8255x-based Fast Ethernet
@@ -9065,6 +9436,7 @@
 		144d 2502  SEM-2100IL MiniPCI LAN Adapter
 		1668 1100  EtherExpress PRO/100B (TX) (MiniPCI Ethernet+Modem)
 		4c53 1080  CT8 mainboard
+		4c53 10e0  PSL09 PrPMC
 		8086 0001  EtherExpress PRO/100B (TX)
 		8086 0002  EtherExpress PRO/100B (T4)
 		8086 0003  EtherExpress PRO/10+
@@ -9174,7 +9546,7 @@
 	1460  82870P2 P64H2 Hub PCI Bridge
 	1461  82870P2 P64H2 I/OxAPIC
 		15d9 3480  P4DP6
-		4c53 1090  Cx9 / Vx9 mainboard
+		4c53 1090  Cx9/Vx9 mainboard
 	1462  82870P2 P64H2 Hot Plug Controller
 	1960  80960RP [i960RP Microprocessor]
 		101e 0431  MegaRAID 431 RAID Controller
@@ -9210,15 +9582,18 @@
 		1028 010e  Optiplex GX240
 	1a31  82845 845 (Brookdale) Chipset AGP Bridge
 	1a38  Server DMA Controller
+	1a48  PRO/10GbE SR Server Adapter
 	2410  82801AA ISA Bridge (LPC)
 	2411  82801AA IDE
 	2412  82801AA USB
 	2413  82801AA SMBus
 	2415  82801AA AC'97 Audio
 		1028 0095  Precision Workstation 220 Integrated Digital Audio
+		110a 0051  Activy 2xx
 		11d4 0040  SoundMAX Integrated Digital Audio
 		11d4 0048  SoundMAX Integrated Digital Audio
 		11d4 5340  SoundMAX Integrated Digital Audio
+		1734 1025  Activy 3xx
 	2416  82801AA AC'97 Modem
 	2418  82801AA PCI Bridge
 	2420  82801AB ISA Bridge (LPC)
@@ -9263,11 +9638,11 @@
 		1462 3370  STAC9721 AC
 		147b 0507  TH7II-RAID
 		8086 4557  D815EGEW Mainboard
-		8384 7600  Sigmatel STAC9700 Codec
 	2446  82801BA/BAM AC'97 Modem
 		1025 1016  Travelmate 612 TX
 		104d 80df  Vaio PCG-FX403
 	2448  82801 Mobile PCI Bridge
+		103c 099c  nx6110
 	2449  82801BA/BAM/CA/CAM Ethernet Controller
 		0e11 0012  EtherExpress PRO/100 VM
 		0e11 0091  EtherExpress PRO/100 VE
@@ -9376,12 +9751,14 @@
 		1025 005a  TravelMate 290
 		1028 0126  Optiplex GX260
 		1028 0163  Latitude D505
+		1028 0196  Inspiron 5160
 		103c 088c  nc8000 laptop
 		103c 0890  nc6000 laptop
 		1071 8160  MIM2000
 		1462 5800  845PE Max (MS-6580)
 		1509 2990  Averatec 5110H laptop
 		4c53 1090  Cx9 / Vx9 mainboard
+		8086 4541  Latitude D400
 	24c3  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) SMBus Controller
 		1014 0267  NetVista A30p
 		1025 005a  TravelMate 290
@@ -9397,17 +9774,21 @@
 		1025 005a  TravelMate 290
 		1028 0126  Optiplex GX260
 		1028 0163  Latitude D505
+		1028 0196  Inspiron 5160
 		103c 088c  nc8000 laptop
 		103c 0890  nc6000 laptop
 		1071 8160  MIM2000
 		1462 5800  845PE Max (MS-6580)
 		1509 2990  Averatec 5110H
 		4c53 1090  Cx9 / Vx9 mainboard
+		8086 4541  Latitude D400
 	24c5  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller
 		0e11 00b8  Analog Devices Inc. codec [SoundMAX]
 		1014 0267  NetVista A30p
 		1025 005a  TravelMate 290
+		1028 0139  Latitude D400
 		1028 0163  Latitude D505
+		1028 0196  Inspiron 5160
 		103c 088c  nc8000 laptop
 		103c 0890  nc6000 laptop
 		1071 8160  MIM2000
@@ -9415,6 +9796,7 @@
 		1462 5800  845PE Max (MS-6580)
 	24c6  82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller
 		1025 005a  TravelMate 290
+		1028 0196  Inspiron 5160
 		103c 088c  nc8000 laptop
 		103c 0890  nc6000 laptop
 		1071 8160  MIM2000
@@ -9423,18 +9805,22 @@
 		1025 005a  TravelMate 290
 		1028 0126  Optiplex GX260
 		1028 0163  Latitude D505
+		1028 0196  Inspiron 5160
 		103c 088c  nc8000 laptop
 		103c 0890  nc6000 laptop
 		1071 8160  MIM2000
 		1462 5800  845PE Max (MS-6580)
 		1509 2990  Averatec 5110H
 		4c53 1090  Cx9 / Vx9 mainboard
+		8086 4541  Latitude D400
 	24ca  82801DBM (ICH4-M) IDE Controller
 		1025 005a  TravelMate 290
 		1028 0163  Latitude D505
+		1028 0196  Inspiron 5160
 		103c 088c  nc8000 laptop
 		103c 0890  nc6000 laptop
 		1071 8160  MIM2000
+		8086 4541  Latitude D400
 	24cb  82801DB (ICH4) IDE Controller
 		1014 0267  NetVista A30p
 		1028 0126  Optiplex GX260
@@ -9446,7 +9832,9 @@
 		1014 0267  NetVista A30p
 		1025 005a  TravelMate 290
 		1028 0126  Optiplex GX260
+		1028 0139  Latitude D400
 		1028 0163  Latitude D505
+		1028 0196  Inspiron 5160
 		103c 088c  nc8000 laptop
 		103c 0890  nc6000 laptop
 		1071 8160  MIM2000
@@ -9455,68 +9843,91 @@
 		4c53 1090  Cx9 / Vx9 mainboard
 	24d0  82801EB/ER (ICH5/ICH5R) LPC Interface Bridge
 	24d1  82801EB (ICH5) SATA Controller
+		1028 0169  Precision 470
+		1028 019a  PowerEdge SC1425
 		103c 12bc  d530 CMT (DG746A)
 		1458 24d1  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
+		15d9 4580  P4SCE Mainboard
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
 		8086 524c  D865PERL mainboard
 	24d2  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1
+		1028 0169  Precision 470
 		1028 0183  PowerEdge 1800
+		1028 019a  PowerEdge SC1425
 		103c 12bc  d530 CMT (DG746A)
 		1043 80a6  P4P800 Mainboard
 		1458 24d2  GA-8IPE1000/8KNXP motherboard
 		1462 7280  865PE Neo2 (MS-6728)
+		15d9 4580  P4SCE Mainboard
+		1734 101c  Primergy RX300 S2
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
 		8086 524c  D865PERL mainboard
 	24d3  82801EB/ER (ICH5/ICH5R) SMBus Controller
+		1028 0169  Precision 470
 		1043 80a6  P4P800 Mainboard
 		1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
+		15d9 4580  P4SCE Mainboard
+		1734 101c  Primergy RX300 S2
 		8086 3427  S875WP1-E mainboard
 		8086 524c  D865PERL mainboard
 	24d4  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2
+		1028 0169  Precision 470
 		1028 0183  PowerEdge 1800
+		1028 019a  PowerEdge SC1425
 		103c 12bc  d530 CMT (DG746A)
 		1043 80a6  P4P800 Mainboard
 		1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
+		15d9 4580  P4SCE Mainboard
+		1734 101c  Primergy RX300 S2
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
 		8086 524c  D865PERL mainboard
 	24d5  82801EB/ER (ICH5/ICH5R) AC'97 Audio Controller
+		1028 0169  Precision 470
 		103c 12bc  Analog Devices codec [SoundMAX Integrated Digital Audio]
 		1043 80f3  P4P800 Mainboard
-# Again, I suppose they use the same in different subsystems
 		1458 a002  GA-8IPE1000/8KNXP motherboard
 		1462 7280  865PE Neo2 (MS-6728)
 		8086 a000  D865PERL mainboard
 		8086 e000  D865PERL mainboard
 		8086 e001  Desktop Board D865GBF
 	24d6  82801EB/ER (ICH5/ICH5R) AC'97 Modem Controller
-	24d7  82801EB/ER (ICH5/ICH5R) USB UHCI #3
+	24d7  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #3
+		1028 0169  Precision 470
 		1028 0183  PowerEdge 1800
 		103c 12bc  d530 CMT (DG746A)
 		1043 80a6  P4P800 Mainboard
 		1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
+		15d9 4580  P4SCE Mainboard
+		1734 101c  Primergy RX300 S2
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
 		8086 524c  D865PERL mainboard
 	24db  82801EB/ER (ICH5/ICH5R) IDE Controller
+		1028 0169  Precision 470
+		1028 019a  PowerEdge SC1425
 		103c 12bc  d530 CMT (DG746A)
 		1043 80a6  P4P800 Mainboard
 		1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
 		1462 7580  MSI 875P
+		15d9 4580  P4SCE Mainboard
+		1734 101c  Primergy RX300 S2
 		8086 24db  P4C800 Mainboard
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
 		8086 524c  D865PERL mainboard
 	24dc  82801EB (ICH5) LPC Interface Bridge
 	24dd  82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller
+		1028 0169  Precision 470
 		1028 0183  PowerEdge 1800
+		1028 019a  PowerEdge SC1425
 		103c 12bc  d530 CMT (DG746A)
 		1043 80a6  P4P800 Mainboard
 		1458 5006  GA-8IPE1000 Pro2 motherboard (865PE)
@@ -9525,9 +9936,12 @@
 		8086 4246  Desktop Board D865GBF
 		8086 524c  D865PERL mainboard
 	24de  82801EB/ER (ICH5/ICH5R) USB UHCI Controller #4
+		1028 0169  Precision 470
 		1043 80a6  P4P800 Mainboard
 		1458 24d2  GA-8IPE1000 Pro2 motherboard (865PE)
 		1462 7280  865PE Neo2 (MS-6728)
+		15d9 4580  P4SCE Mainboard
+		1734 101c  Primergy RX300 S2
 		8086 3427  S875WP1-E mainboard
 		8086 4246  Desktop Board D865GBF
 		8086 524c  D865PERL mainboard
@@ -9581,49 +9995,71 @@
 		1458 2570  GA-8IPE1000 Pro2 motherboard (865PE)
 	2571  82865G/PE/P PCI to AGP Controller
 	2572  82865G Integrated Graphics Controller
+		1028 019d  Dimension 3000
 	2573  82865G/PE/P PCI to CSA Bridge
 	2576  82865G/PE/P Processor to I/O Memory Interface
 	2578  82875P/E7210 Memory Controller Hub
 		1458 2578  GA-8KNXP motherboard (875P)
 		1462 7580  MS-6758 (875P Neo)
-# Motherboard P4SCE
-		15d9 4580  Super Micro Computer Inc. P4SCE
+		15d9 4580  P4SCE Motherboard
 	2579  82875P Processor to AGP Controller
 	257b  82875P/E7210 Processor to PCI to CSA Bridge
 	257e  82875P/E7210 Processor to I/O Memory Interface
 	2580  915G/P/GV/GL/PL/910GL Processor to I/O Controller
+		1734 105b  Scenic W620
 	2581  915G/P/GV/GL/PL/910GL PCI Express Root Port
 	2582  82915G/GV/910GL Express Chipset Family Graphics Controller
 		1028 1079  Optiplex GX280
+		1734 105b  Scenic W620
 	2584  925X/XE Memory Controller Hub
 	2585  925X/XE PCI Express Root Port
 	2588  E7220/E7221 Memory Controller Hub
 	2589  E7220/E7221 PCI Express Root Port
 	258a  E7221 Integrated Graphics Controller
 	2590  Mobile 915GM/PM/GMS/910GML Express Processor to DRAM Controller
+		103c 099c  nx6110
+		a304 81b7  Vaio VGN-S3XP
 	2591  Mobile 915GM/PM Express PCI Express Root Port
 	2592  Mobile 915GM/GMS/910GML Express Graphics Controller
+		103c 099c  nx6110
 	25a1  6300ESB LPC Interface Controller
 	25a2  6300ESB PATA Storage Controller
 		4c53 10b0  CL9 mainboard
+		4c53 10e0  PSL09 PrPMC
 	25a3  6300ESB SATA Storage Controller
 		4c53 10b0  CL9 mainboard
+		4c53 10d0  Telum ASLP10 Processor AMC
+		4c53 10e0  PSL09 PrPMC
 	25a4  6300ESB SMBus Controller
 		4c53 10b0  CL9 mainboard
+		4c53 10d0  Telum ASLP10 Processor AMC
+		4c53 10e0  PSL09 PrPMC
 	25a6  6300ESB AC'97 Audio Controller
 		4c53 10b0  CL9 mainboard
 	25a7  6300ESB AC'97 Modem Controller
 	25a9  6300ESB USB Universal Host Controller
 		4c53 10b0  CL9 mainboard
+		4c53 10d0  Telum ASLP10 Processor AMC
+		4c53 10e0  PSL09 PrPMC
 	25aa  6300ESB USB Universal Host Controller
 		4c53 10b0  CL9 mainboard
+		4c53 10e0  PSL09 PrPMC
 	25ab  6300ESB Watchdog Timer
 		4c53 10b0  CL9 mainboard
+		4c53 10d0  Telum ASLP10 Processor AMC
+		4c53 10e0  PSL09 PrPMC
 	25ac  6300ESB I/O Advanced Programmable Interrupt Controller
 		4c53 10b0  CL9 mainboard
+		4c53 10d0  Telum ASLP10 Processor AMC
+		4c53 10e0  PSL09 PrPMC
 	25ad  6300ESB USB2 Enhanced Host Controller
+		4c53 10b0  CL9 mainboard
+		4c53 10d0  Telum ASLP10 Processor AMC
+		4c53 10e0  PSL09 PrPMC
 	25ae  6300ESB 64-bit PCI-X Bridge
 	25b0  6300ESB SATA RAID Controller
+		4c53 10d0  Telum ASLP10 Processor AMC
+		4c53 10e0  PSL09 PrPMC
 	25c0  Workstation Memory Controller Hub
 	25d0  Server Memory Controller Hub
 	25d8  Server Memory Controller Hub
@@ -9641,7 +10077,7 @@
 	25f8  Server PCI Express x8 Port 4-5
 	25f9  Server PCI Express x8 Port 6-7
 	25fa  Server PCI Express x16 Port 4-7
-	2600  E8500 Hub Interface
+	2600  E8500 Hub Interface 1.5
 	2601  E8500 PCI Express x4 Port D
 	2602  E8500 PCI Express x4 Port C0
 	2603  E8500 PCI Express x4 Port C1
@@ -9653,7 +10089,7 @@
 	2609  E8500 PCI Express x8 Port B
 	260a  E8500 PCI Express x8 Port A
 	260c  E8500 IMI Registers
-	2610  E8500 System Bus, Boot, and Interrupt Registers
+	2610  E8500 Front Side Bus, Boot, and Interrupt Registers
 	2611  E8500 Address Mapping Registers
 	2612  E8500 RAS Registers
 	2613  E8500 Reserved Registers
@@ -9676,22 +10112,35 @@
 	2626  E8500 XMB Reserved Registers
 	2627  E8500 XMB Reserved Registers
 	2640  82801FB/FR (ICH6/ICH6R) LPC Interface Bridge
+		1734 105c  Scenic W620
 	2641  82801FBM (ICH6M) LPC Interface Bridge
+		103c 099c  nx6110
 	2642  82801FW/FRW (ICH6W/ICH6RW) LPC Interface Bridge
 	2651  82801FB/FW (ICH6/ICH6W) SATA Controller
 		1028 0179  Optiplex GX280
+		1734 105c  Scenic W620
 	2652  82801FR/FRW (ICH6R/ICH6RW) SATA Controller
 	2653  82801FBM (ICH6M) SATA Controller
 	2658  82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #1
 		1028 0179  Optiplex GX280
+		103c 099c  nx6110
+		1734 105c  Scenic W620
 	2659  82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #2
 		1028 0179  Optiplex GX280
+		103c 099c  nx6110
+		1734 105c  Scenic W620
 	265a  82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #3
 		1028 0179  Optiplex GX280
+		103c 099c  nx6110
+		1734 105c  Scenic W620
 	265b  82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #4
 		1028 0179  Optiplex GX280
+		103c 099c  nx6110
+		1734 105c  Scenic W620
 	265c  82801FB/FBM/FR/FW/FRW (ICH6 Family) USB2 EHCI Controller
 		1028 0179  Optiplex GX280
+		103c 099c  nx6110
+		1734 105c  Scenic W620
 	2660  82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 1
 	2662  82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 2
 	2664  82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 3
@@ -9699,12 +10148,18 @@
 	2668  82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller
 	266a  82801FB/FBM/FR/FW/FRW (ICH6 Family) SMBus Controller
 		1028 0179  Optiplex GX280
+		1734 105c  Scenic W620
 	266c  82801FB/FBM/FR/FW/FRW (ICH6 Family) LAN Controller
 	266d  82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Modem Controller
+		103c 099c  nx6110
 	266e  82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Audio Controller
 		1028 0179  Optiplex GX280
 		1028 0188  Inspiron 6000 laptop
+		103c 099c  nx6110
+		1734 105a  Scenic W620
 	266f  82801FB/FBM/FR/FW/FRW (ICH6 Family) IDE Controller
+		103c 099c  nx6110
+		1734 105c  Scenic W620
 	2670  Enterprise Southbridge LPC
 	2680  Enterprise Southbridge SATA cc=IDE
 	2681  Enterprise Southbridge SATA cc=AHCI
@@ -9724,29 +10179,32 @@
 	269a  Enterprise Southbridge High Definition Audio
 	269b  Enterprise Southbridge SMBus
 	269e  Enterprise Southbridge PATA
-	2770  Memory Controller Hub
-	2771  PCI Express Graphics Port
-	2772  Integrated Graphics Controller
+	2770  945G/P Memory Controller Hub
+	2771  945G/P PCI Express Graphics Port
+	2772  945G Integrated Graphics Controller
 	2774  955X Memory Controller Hub
 	2775  955X PCI Express Graphics Port
-	2776  Integrated Graphics Controller
-	2778  Server Memory Controller Hub
-	2779  PCI Express Root Port
+	2776  945G Integrated Graphics Controller
+	2778  E7230 Memory Controller Hub
+	2779  E7230 PCI Express Root Port
 	2782  82915G Express Chipset Family Graphics Controller
+		1734 105b  Scenic W620
 	2792  Mobile 915GM/GMS/910GML Express Graphics Controller
+		103c 099c  nx6110
 	27a0  Mobile Memory Controller Hub
 	27a1  Mobile PCI Express Graphics Port
 	27a2  Mobile Integrated Graphics Controller
 	27a6  Mobile Integrated Graphics Controller
-	27b0  I/O Controller Hub LPC
+	27b0  82801GH (ICH7DH) LPC Interface Bridge
 	27b8  82801GB/GR (ICH7 Family) LPC Interface Bridge
-	27b9  Mobile I/O Controller Hub LPC
-	27bd  Mobile I/O Controller Hub LPC
+	27b9  82801GBM (ICH7-M) LPC Interface Bridge
+	27bd  82801GHM (ICH7-M DH) LPC Interface Bridge
 	27c0  82801GB/GR/GH (ICH7 Family) Serial ATA Storage Controllers cc=IDE
 	27c1  82801GR/GH (ICH7 Family) Serial ATA Storage Controllers cc=AHCI
 	27c3  82801GR/GH (ICH7 Family) Serial ATA Storage Controllers cc=RAID
-	27c4  Mobile I/O Controller Hub SATA cc=IDE
-	27c5  Mobile I/O Controller Hub SATA cc=AHCI
+	27c4  82801GBM/GHM (ICH7 Family) Serial ATA Storage Controllers cc=IDE
+	27c5  82801GBM/GHM (ICH7 Family) Serial ATA Storage Controllers cc=AHCI
+	27c6  82801GHM (ICH7-M DH) Serial ATA Storage Controllers cc=RAID
 	27c8  82801G (ICH7 Family) USB UHCI #1
 	27c9  82801G (ICH7 Family) USB UHCI #2
 	27ca  82801G (ICH7 Family) USB UHCI #3
@@ -9791,23 +10249,40 @@
 		1014 0513  ThinkPad A/T/X Series
 	3578  82830 830 Chipset Host Bridge
 	3580  82852/82855 GM/GME/PM/GMV Processor to I/O Controller
+		1028 0139  Latitude D400
 		1028 0163  Latitude D505
+		1028 0196  Inspiron 5160
 		4c53 10b0  CL9 mainboard
+		4c53 10e0  PSL09 PrPMC
 	3581  82852/82855 GM/GME/PM/GMV Processor to AGP Controller
 	3582  82852/855GM Integrated Graphics Device
+		1028 0139  Latitude D400
 		1028 0163  Latitude D505
 		4c53 10b0  CL9 mainboard
+		4c53 10e0  PSL09 PrPMC
 	3584  82852/82855 GM/GME/PM/GMV Processor to I/O Controller
+		1028 0139  Latitude D400
 		1028 0163  Latitude D505
+		1028 0196  Inspiron 5160
 		4c53 10b0  CL9 mainboard
+		4c53 10e0  PSL09 PrPMC
 	3585  82852/82855 GM/GME/PM/GMV Processor to I/O Controller
+		1028 0139  Latitude D400
 		1028 0163  Latitude D505
+		1028 0196  Inspiron 5160
 		4c53 10b0  CL9 mainboard
+		4c53 10e0  PSL09 PrPMC
 	3590  E7520 Memory Controller Hub
+		1028 019a  PowerEdge SC1425
+		1734 103e  Primergy RX300 S2
+		4c53 10d0  Telum ASLP10 Processor AMC
 	3591  E7525/E7520 Error Reporting Registers
+		1028 0169  Precision 470
+		4c53 10d0  Telum ASLP10 Processor AMC
 	3592  E7320 Memory Controller Hub
 	3593  E7320 Error Reporting Registers
 	3594  E7520 DMA Controller
+		4c53 10d0  Telum ASLP10 Processor AMC
 	3595  E7525/E7520/E7320 PCI Express Port A
 	3596  E7525/E7520/E7320 PCI Express Port A1
 	3597  E7525/E7520 PCI Express Port B
@@ -9816,8 +10291,10 @@
 	359a  E7520 PCI Express Port C1
 	359b  E7525/E7520/E7320 Extended Configuration Registers
 	359e  E7525 Memory Controller Hub
+		1028 0169  Precision 470
 	4220  PRO/Wireless 2200BG
 	4223  PRO/Wireless 2915ABG MiniPCI Adapter
+	4224  PRO/Wireless 2915ABG MiniPCI Adapter
 	5200  EtherExpress PRO/100 Intelligent Server
 	5201  EtherExpress PRO/100 Intelligent Server
 		8086 0001  EtherExpress PRO/100 Server Ethernet Adapter
@@ -9826,7 +10303,7 @@
 	7010  82371SB PIIX3 IDE [Natoma/Triton II]
 	7020  82371SB PIIX3 USB [Natoma/Triton II]
 	7030  430VX - 82437VX TVX [Triton VX]
-	7050  Intel Intercast Video Capture Card
+	7050  Intercast Video Capture Card
 	7100  430TX - 82439TX MTXC
 	7110  82371AB/EB/MB PIIX4 ISA
 		15ad 1976  virtualHW v3
@@ -9905,7 +10382,7 @@
 	84e4  460GX - 84460GX Memory Data Controller (MDC)
 	84e6  460GX - 82466GX Wide and fast PCI eXpander Bridge (WXB)
 	84ea  460GX - 84460GX AGP Bridge (GXB function 1)
-	8500  IXP4XX - Intel Network Processor family. IXP420, IXP421, IXP422, IXP425 and IXC1100
+	8500  IXP4XX Intel Network Processor (IXP420/421/422/425/IXC1100)
 		1993 0ded  mGuard-PCI AV#2
 		1993 0dee  mGuard-PCI AV#1
 		1993 0def  mGuard-PCI AV#0
@@ -9916,10 +10393,6 @@
 	9622  Integrated RAID
 	9641  Integrated RAID
 	96a1  Integrated RAID
-# retail verson
-	a01f  PRO/10GbE LR Server Adapter
-# OEM version
-	a11f  PRO/10GbE LR Server Adapter
 	b152  21152 PCI-to-PCI Bridge
 # observed, and documented in Intel revision note; new mask of 1011:0026
 	b154  21154 PCI-to-PCI Bridge
@@ -9928,12 +10401,12 @@
 		4c53 1050  CT7 mainboard
 		4c53 1051  CE7 mainboard
 		e4bf 1000  CC8-1-BLUES
-	ffff  450NX/GX [Orion] - 82453KX/GX Memory controller [BUG]
 8401  TRENDware International Inc.
 8800  Trigem Computer Inc.
 	2008  Video assistent component
 8866  T-Square Design Inc.
 8888  Silicon Magic
+8912  TRX
 # 8c4a is not Winbond but there is a board misprogrammed
 8c4a  Winbond
 	1980  W89C940 misprogrammed [ne2k]
@@ -10102,10 +10575,10 @@
 		10f1 2462  Thunder K7 S2462
 		15d9 9005  Onboard SCSI Host Adapter
 		8086 3411  SDS2 Mainboard
+	0241  Serial ATA II RAID 1420SA
 	0250  ServeRAID Controller
 		1014 0279  ServeRAID-xx
 		1014 028c  ServeRAID-xx
-# from kernel sources
 	0279  ServeRAID 6M
 	0283  AAC-RAID
 		9005 0283  Catapult
@@ -10125,7 +10598,8 @@
 		9005 0288  3230S (Harrier)
 		9005 0289  3240S (Tornado)
 		9005 028a  ASR-2020S PCI-X ZCR (Skyhawk)
-		9005 028b  ASR-2020S SO-DIMM PCI-X ZCR (Terminator)
+		9005 028b  ASR-2025S (Terminator)
+		9005 028e  ASR-2020SA (Skyhawk)
 		9005 028f  ASR-2025SA
 		9005 0290  AAR-2410SA PCI SATA 4ch (Jaguar II)
 		9005 0292  AAR-2810SA PCI SATA 8ch (Corsair-8)
@@ -10137,13 +10611,22 @@
 		9005 0299  ASR-4800SAS
 		9005 029a  ASR-4805SAS
 	0286  AAC-RAID (Rocket)
+		1014 9540  ServeRAID 8k/8k-l4
+		1014 9580  ServeRAID 8k/8k-l8
 		9005 028c  ASR-2230S + ASR-2230SLP PCI-X (Lancer)
 		9005 028d  ASR-2130S
 		9005 029b  ASR-2820SA
 		9005 029c  ASR-2620SA
 		9005 029d  ASR-2420SA
-		9005 029e  ICP9024R0
-		9005 029f  ICP9014R0
+		9005 029e  ICP ICP9024R0
+		9005 029f  ICP ICP9014R0
+		9005 02a0  ICP ICP9047MA
+		9005 02a1  ICP ICP9087MA
+		9005 02a2  ASR-4810SAS
+		9005 02a3  ICP ICP5085AU
+		9005 02a4  ICP ICP5085LI
+		9005 02a5  ICP ICP5085BR
+		9005 02a6  ICP9067MA
 		9005 0800  Callisto
 	0503  Scamp chipset SCSI controller
 	0910  AUA-3100B
@@ -10151,6 +10634,7 @@
 	8000  ASC-29320A U320
 	800f  AIC-7901 U320
 	8010  ASC-39320 U320
+	8011  ASC-39320D
 		0e11 00ac  ASC-39320D U320
 		9005 0041  ASC-39320D U320
 	8012  ASC-29320 U320
@@ -10163,6 +10647,7 @@
 	801d  AIC-7902B U320
 	801e  AIC-7901A U320
 	801f  AIC-7902 U320
+		1734 1011  Primergy RX300
 	8080  ASC-29320A U320 w/HostRAID
 	808f  AIC-7901 U320 w/HostRAID
 	8090  ASC-39320 U320 w/HostRAID
@@ -10213,6 +10698,7 @@ aa42  Scitex Digital Video
 ac1e  Digital Receiver Technology Inc
 ac3d  Actuality Systems
 aecb  Adrienne Electronics Corporation
+	6250  VITC/LTC Timecode Reader card [PCI-VLTC/RDR]
 b1b3  Shiva Europe Limited
 # Pinnacle should be 11bd, but they got it wrong several times --mj
 bd11  Pinnacle Systems, Inc. (Wrong ID)
@@ -10236,11 +10722,12 @@ deaf  Middle Digital Inc.
 	9051  PC Weasel Serial Port
 	9052  PC Weasel Watchdog Timer
 e000  Winbond
+	e000  W89C940
+e159  Tiger Jet Network Inc.
 	0001  Tiger3XX Modem/ISDN interface
 		0059 0001  128k ISDN-S/T Adapter
 		0059 0003  128k ISDN-U Adapter
 	0002  Tiger100APC ISDN chipset
-	e000  W89C940
 e4bf  EKF Elektronik GmbH
 # Innovative and scalable network IC vendor
 e55e  Essence Technology, Inc.
@@ -10272,17 +10759,21 @@ edd8  ARK Logic Inc
 	a0a1  2000MT
 	a0a9  2000MI
 f1d0  AJA Video
-# All boards I have seen have this ID not efac, though all docs say efac...
-	cafe  KONA SD SMPTE 259M I/O
-	efac  KONA SD SMPTE 259M I/O
-	facd  KONA HD SMPTE 292M I/O
+	c0fe  Xena HS/HD-R
+	c0ff  Kona/Xena 2
+	cafe  Kona SD
+	cfee  Xena LS/SD-22-DA/SD-DA
+	dcaf  Kona HD
+	dfee  Xena HD-DA
+	efac  Xena SD-MM/SD-22-MM
+	facd  Xena HD-MM
 fa57  Interagon AS
 	0001  PMC [Pattern Matching Chip]
 febd  Ultraview Corp.
-feda  Broadcom Inc (nee Epigram)
+# Nee Epigram
+feda  Broadcom Inc
 	a0fa  BCM4210 iLine10 HomePNA 2.0
 	a10e  BCM4230 iLine10 HomePNA 2.0
-# IT & Telecom company, develops PCI Trunk cards <www.fedetec.es>
 fede  Fedetec Inc.
 	0003  TABIC PCI v3
 fffe  VMWare Inc
@@ -10307,7 +10798,7 @@ C 01  Mass storage controller
 	02  Floppy disk controller
 	03  IPI bus controller
 	04  RAID bus controller
-	80  Unknown mass storage controller
+	80  Mass storage controller
 C 02  Network controller
 	00  Ethernet controller
 	01  Token ring network controller
diff --git a/initrd/initrd-stuff/usr/share/hwdata/pcitable b/initrd/initrd-stuff/usr/share/hwdata/pcitable
index a23b8edc..a00ee29a 100644
--- a/initrd/initrd-stuff/usr/share/hwdata/pcitable
+++ b/initrd/initrd-stuff/usr/share/hwdata/pcitable
@@ -1,1363 +1,1053 @@
-# The format is ("%d\t%d\t%s\t"%s"\n", vendid, devid, moduleName)
-# or ("%d\t%d\t%d\t%d\t%s\t"%s"\n", vendid, devid, subvendid, subdevid, moduleName)
-0x0675	0x1702	"hisax"
-0x0e11	0x0046	"cciss"
-0x0e11	0xae10	"cpqarray"
-0x0e11	0xae32	"tlan"
-0x0e11	0xae34	"tlan"
-0x0e11	0xae35	"tlan"
-0x0e11	0xae40	"tlan"
-0x0e11	0xae43	"tlan"
-0x0e11	0xb011	"tlan"
-0x0e11	0xb012	"tlan"
-0x0e11	0xb030	"tlan"
-0x0e11	0xb060	"cciss"
-0x0e11	0xb178	"cciss"
-0x0e11	0xf130	"tlan"
-0x0e11	0xf150	"tlan"
-0x1000	0x0001	"sym53c8xx"
-0x1000	0x0002	"sym53c8xx"
-0x1000	0x0003	"sym53c8xx"
-0x1000	0x0004	"sym53c8xx"
-0x1000	0x0005	"sym53c8xx"
-0x1000	0x0006	"sym53c8xx"
-0x1000	0x000a	"sym53c8xx"
-0x1000	0x000b	"sym53c8xx"
-0x1000	0x000c	"sym53c8xx"
-0x1000	0x000d	"sym53c8xx"
-0x1000	0x000f	"sym53c8xx"
-0x1000	0x0010	"sym53c8xx"
-0x1000	0x0010	0x0e11	0x4040	"cpqarray"
-0x1000	0x0010	0x0e11	0x4048	"cpqarray"
-0x1000	0x0012	"sym53c8xx"
-0x1000	0x0013	"sym53c8xx"
-0x1000	0x0020	"sym53c8xx"
-0x1000	0x0021	"sym53c8xx"
-0x1000	0x0030	"mptscsih"
-0x1000	0x0032	"mptscsih"
-0x1000	0x0040	"mptscsih"
-0x1000	0x008f	"sym53c8xx"
-0x1000	0x0407	0x1000	0x0530	"megaraid_mbox"
-0x1000	0x0407	0x1000	0x0531	"megaraid_mbox"
-0x1000	0x0407	0x1000	0x0532	"megaraid_mbox"
-0x1000	0x0407	0x8086	0x0532	"megaraid_mbox"
-0x1000	0x0621	"mptscsih"
-0x1000	0x0622	"mptscsih"
-0x1000	0x0623	"mptscsih"
-0x1000	0x0624	"mptscsih"
-0x1000	0x0625	"mptscsih"
-0x1000	0x0626	"mptscsih"
-0x1000	0x0627	"mptscsih"
-0x1000	0x0628	"mptscsih"
-0x1000	0x0629	"mptscsih"
-0x1000	0x0701	"yellowfin"
-0x1000	0x0702	"yellowfin"
-0x1000	0x1960	0x1000	0x0518	"megaraid_mbox"
-0x1000	0x1960	0x1000	0x0520	"megaraid_mbox"
-0x1000	0x1960	0x1000	0x0523	"megaraid_mbox"
-0x1000	0x1960	0x1000	0x4523	"megaraid_mbox"
-0x1000	0x1960	0x1000	0xa520	"megaraid_mbox"
-0x1000	0x1960	0x1028	0x0518	"megaraid_mbox"
-0x1000	0x1960	0x1028	0x0520	"megaraid_mbox"
-0x1000	0x1960	0x1028	0x0531	"megaraid_mbox"
-0x1000	0x1960	0x1000	0xa520	"megaraid_mbox"
-0x1002	0x3150	"Card:ATI Radeon Mobility X600"
-0x1002	0x3154	"Card:ATI FireGL M24 GL"
-0x1002	0x3e50	"Card:ATI Radeon X600"
-0x1002	0x3e54	"Card:ATI FireGL V3200"
-0x1002	0x4136	"Card:ATI Radeon IGP320"
-0x1002	0x4137	"Card:ATI Radeon IGP330/340/350"
-0x1002	0x4144	"Card:ATI Radeon 9500 Pro"
-0x1002	0x4145	"Card:ATI Radeon 9500 Pro"
-0x1002	0x4146	"Card:ATI Radeon 9500 Pro"
-0x1002	0x4147	"Card:ATI FireGL Z1/X1"
-0x1002	0x4148	"Card:ATI Radeon 9800"
-0x1002	0x4149	"Card:ATI Radeon 9800"
-0x1002	0x414a	"Card:ATI Radeon 9800"
-0x1002	0x414b	"Card:ATI FireGL X2"
-0x1002	0x4150	"Card:ATI Radeon 9600"
-0x1002	0x4151	"Card:ATI Radeon 9600"
-0x1002	0x4152	"Card:ATI Radeon 9600"
-0x1002	0x4153	"Card:ATI Radeon 9600"
-0x1002	0x4154	"Card:ATI FireGL T2"
-0x1002	0x4155	"Card:ATI FireGL T2"
-0x1002	0x4156	"Card:ATI FireGL T2"
-0x1002	0x4157	"Card:ATI FireGL T2"
-0x1002	0x4158	"Card:ATI Mach32"
-0x1002	0x4237	"Card:ATI Radeon 7000 IGP"
-0x1002	0x4242	"Card:ATI Radeon 8500"
-0x1002	0x4243	"Card:ATI Radeon 8500"
-0x1002	0x4336	"Card:ATI Radeon Mobility U1"
-0x1002	0x4337	"Card:ATI Radeon IGP330M/340M/350M"
-0x1002	0x4354	"Card:ATI Mach64"
-0x1002	0x4358	"Card:ATI Mach64"
-0x1002	0x4437	"Card:ATI Radeon Mobility 7000"
-0x1002	0x4554	"Card:ATI Mach64"
-0x1002	0x4654	"Card:ATI Mach64"
-0x1002	0x4742	"Card:ATI Mach64"
-0x1002	0x4744	"Card:ATI Mach64"
-0x1002	0x4747	"Card:ATI Mach64"
-0x1002	0x4749	"Card:ATI Mach64"
-0x1002	0x474c	"Card:ATI Mach64"
-0x1002	0x474d	"Card:ATI Mach64"
-0x1002	0x474e	"Card:ATI Mach64"
-0x1002	0x474f	"Card:ATI Mach64"
-0x1002	0x4750	"Card:ATI Mach64"
-0x1002	0x4751	"Card:ATI Mach64"
-0x1002	0x4752	"Card:ATI Mach64"
-0x1002	0x4753	"Card:ATI Mach64"
-0x1002	0x4754	"Card:ATI Mach64 3D RAGE II"
-0x1002	0x4755	"Card:ATI Mach64 3D RAGE II"
-0x1002	0x4756	"Card:ATI Mach64 3D RAGE II"
-0x1002	0x4757	"Card:ATI Mach64 3D Rage IIC"
-0x1002	0x4758	"Card:ATI Mach64"
-0x1002	0x4759	"Card:ATI Mach64 3D Rage IIC"
-0x1002	0x475a	"Card:ATI Mach64 3D Rage IIC"
-0x1002	0x4964	"Card:ATI Radeon 9000"
-0x1002	0x4965	"Card:ATI Radeon 9000"
-0x1002	0x4966	"Card:ATI Radeon 9000"
-0x1002	0x4967	"Card:ATI Radeon 9000"
-0x1002	0x4a48	"Card:ATI Radeon X800"
-0x1002	0x4a49	"Card:ATI Radeon X800PRO"
-0x1002	0x4a4a	"Card:ATI Radeon X800SE"
-0x1002	0x4a4b	"Card:ATI Radeon X800"
-0x1002	0x4a4c	"Card:ATI Radeon X800"
-0x1002	0x4a4d	"Card:ATI FireGL X3"
-0x1002	0x4a4e	"Card:ATI Radeon Mobility 9800"
-0x1002	0x4a50	"Card:ATI Radeon X800XT"
-0x1002	0x4c42	"Card:ATI Mach64"
-0x1002	0x4c44	"Card:ATI Mach64"
-0x1002	0x4c45	"Card:ATI Rage 128 Mobility"
-0x1002	0x4c46	"Card:ATI Rage 128 Mobility"
-0x1002	0x4c47	"Card:ATI Mach64"
-0x1002	0x4c49	"Card:ATI Mach64"
-0x1002	0x4c4d	"Card:ATI Rage Mobility"
-0x1002	0x4c4e	"Card:ATI Rage Mobility"
-0x1002	0x4c50	"Card:ATI Mach64"
-0x1002	0x4c51	"Card:ATI Mach64"
-0x1002	0x4c52	"Card:ATI Rage Mobility"
-0x1002	0x4c53	"Card:ATI Rage Mobility"
-0x1002	0x4c54	"Card:ATI Mach64"
-0x1002	0x4c57	"Card:ATI Radeon Mobility 7500"
-0x1002	0x4c58	"Card:ATI Mobility FireGL 7800"
-0x1002	0x4c59	"Card:ATI Radeon Mobility M6"
-0x1002	0x4c5a	"Card:ATI Radeon Mobility M6"
-0x1002	0x4c64	"Card:ATI Radeon Mobility M9"
-0x1002	0x4c65	"Card:ATI Radeon Mobility M9"
-0x1002	0x4c66	"Card:ATI Radeon Mobility M9"
-0x1002	0x4c67	"Card:ATI Radeon Mobility M9"
-0x1002	0x4d46	"Card:ATI Rage 128 Mobility"
-0x1002	0x4d4c	"Card:ATI Rage 128 Mobility"
-0x1002	0x4e44	"Card:ATI Radeon 9700 Pro"
-0x1002	0x4e45	"Card:ATI Radeon 9500 Pro"
-0x1002	0x4e46	"Card:ATI Radeon 9700"
-0x1002	0x4e47	"Card:ATI FireGL X1"
-0x1002	0x4e48	"Card:ATI Radeon 9800"
-0x1002	0x4e49	"Card:ATI Radeon 9800"
-0x1002	0x4e4a	"Card:ATI Radeon 9800 XT"
-0x1002	0x4e4b	"Card:ATI FireGL X2"
-0x1002	0x4e50	"Card:ATI Radeon Mobility 9600 M10"
-0x1002	0x4e51	"Card:ATI Radeon Mobility 9600"
-0x1002	0x4e52	"Card:ATI Radeon Mobility 9600 M10"
-0x1002	0x4e53	"Card:ATI Radeon Mobility 9600"
-0x1002	0x4e54	"Card:ATI FireGL Mobility T2"
-0x1002	0x4e56	"Card:ATI FireGL Mobility T2e"
-0x1002	0x5041	"Card:ATI Rage 128"
-0x1002	0x5042	"Card:ATI Rage 128"
-0x1002	0x5043	"Card:ATI Rage 128"
-0x1002	0x5044	"Card:ATI Rage 128"
-0x1002	0x5045	"Card:ATI Rage 128"
-0x1002	0x5046	"Card:ATI Rage 128"
-0x1002	0x5047	"Card:ATI Rage 128"
-0x1002	0x5048	"Card:ATI Rage 128"
-0x1002	0x5049	"Card:ATI Rage 128"
-0x1002	0x504a	"Card:ATI Rage 128"
-0x1002	0x504b	"Card:ATI Rage 128"
-0x1002	0x504c	"Card:ATI Rage 128"
-0x1002	0x504d	"Card:ATI Rage 128"
-0x1002	0x504e	"Card:ATI Rage 128"
-0x1002	0x504f	"Card:ATI Rage 128"
-0x1002	0x5050	"Card:ATI Rage 128"
-0x1002	0x5051	"Card:ATI Rage 128"
-0x1002	0x5052	"Card:ATI Rage 128"
-0x1002	0x5053	"Card:ATI Rage 128"
-0x1002	0x5054	"Card:ATI Rage 128"
-0x1002	0x5055	"Card:ATI Rage 128"
-0x1002	0x5056	"Card:ATI Rage 128"
-0x1002	0x5057	"Card:ATI Rage 128"
-0x1002	0x5058	"Card:ATI Rage 128"
-0x1002	0x5144	"Card:ATI Radeon 7200"
-0x1002	0x5145	"Card:ATI Radeon (generic)"
-0x1002	0x5146	"Card:ATI Radeon (generic)"
-0x1002	0x5147	"Card:ATI Radeon (generic)"
-0x1002	0x5148	"Card:ATI Radeon 8500"
-0x1002	0x5148	0x1002	0x010a	"Card:ATI FireGL 8800"
-0x1002	0x5148	0x1002	0x0152	"Card:ATI FireGL 8800"
-0x1002	0x5148	0x1002	0x0162	"Card:ATI FireGL 8700"
-0x1002	0x5148	0x1002	0x0172	"Card:ATI FireGL 8700"
-0x1002	0x5149	"Card:ATI Radeon 8500"
-0x1002	0x514a	"Card:ATI Radeon 8500"
-0x1002	0x514b	"Card:ATI Radeon 8500"
-0x1002	0x514c	"Card:ATI Radeon 8500LE"
-0x1002	0x514d	"Card:ATI Radeon 9100"
-0x1002	0x514e	"Card:ATI Radeon 8500LE"
-0x1002	0x514f	"Card:ATI Radeon 8500LE"
-0x1002	0x5157	"Card:ATI Radeon 7500"
-0x1002	0x5158	"Card:ATI Radeon 7500"
-0x1002	0x5159	"Card:ATI Radeon 7000"
-0x1002	0x5159	0x1002	0x000b	"Card:ATI Radeon 7000"
-0x1002	0x5159	0x1002	0x013a	"Card:ATI Radeon 7000"
-0x1002	0x515a	"Card:ATI Radeon VE"
-0x1002	0x5168	"Card:ATI Radeon 8500"
-0x1002	0x5169	"Card:ATI Radeon 8500"
-0x1002	0x516a	"Card:ATI Radeon 8500"
-0x1002	0x516b	"Card:ATI Radeon 8500"
-0x1002	0x516c	"Card:ATI Radeon 8500"
-0x1002	0x5245	"Card:ATI Rage 128"
-0x1002	0x5246	"Card:ATI Rage 128"
-0x1002	0x5247	"Card:ATI Rage 128"
-0x1002	0x524b	"Card:ATI Rage 128"
-0x1002	0x524c	"Card:ATI Rage 128"
-0x1002	0x5345	"Card:ATI Rage 128"
-0x1002	0x5346	"Card:ATI Rage 128"
-0x1002	0x5347	"Card:ATI Rage 128"
-0x1002	0x5348	"Card:ATI Rage 128"
-0x1002	0x534b	"Card:ATI Rage 128"
-0x1002	0x534c	"Card:ATI Rage 128"
-0x1002	0x534d	"Card:ATI Rage 128"
-0x1002	0x534e	"Card:ATI Rage 128"
-0x1002	0x5354	"Card:ATI Mach64 VT (264VT)"
-0x1002	0x5446	"Card:ATI Rage 128 Pro Ultra"
-0x1002	0x544c	"Card:ATI Rage 128 Pro Ultra"
-0x1002	0x5452	"Card:ATI Rage 128 Pro Ultra"
-0x1002	0x5453	"Card:ATI Rage 128 Pro Ultra"
-0x1002	0x5454	"Card:ATI Rage 128 Pro Ultra"
-0x1002	0x5455	"Card:ATI Rage 128 Pro Ultra"
-0x1002	0x5460	"Card:ATI Radeon Mobility M300"
-0x1002	0x5464	"Card:ATI FireGL M22 GL"
-0x1002	0x5548	"Card:ATI Radeon X800"
-0x1002	0x5549	"Card:ATI Radeon X800PRO"
-0x1002	0x554a	"Card:ATI Radeon X800LE"
-0x1002	0x554b	"Card:ATI Radeon X800SE"
-0x1002	0x5551	"Card:ATI FireGL V7200"
-0x1002	0x5552	"Card:ATI FireGL V5100"
-0x1002	0x5554	"Card:ATI FireGL V7100"
-0x1002	0x5654	"Card:ATI Mach64 VT (264VT)"
-0x1002	0x5655	"Card:ATI Mach64 VT (264VT)"
-0x1002	0x5656	"Card:ATI Mach64 VT (264VT)"
-0x1002	0x5834	"Card:ATI Radeon 9100 IGP"
-0x1002	0x5835	"Card:ATI Radeon Mobility 9100 IGP"
-0x1002	0x5960	"Card:ATI Radeon 9200PRO"
-0x1002	0x5961	"Card:ATI Radeon 9200"
-0x1002	0x5962	"Card:ATI Radeon 9200"
-0x1002	0x5964	"Card:ATI Radeon 9200SE"
-0x1002	0x5b60	"Card:ATI Radeon X300"
-0x1002	0x5b62	"Card:ATI Radeon X600"
-0x1002	0x5b64	"Card:ATI FireGL V3100"
-0x1002	0x5b65	"Card:ATI FireGL D1100"
-0x1002	0x5c61	"Card:ATI Radeon Mobility 9200"
-0x1002	0x5c63	"Card:ATI Radeon Mobility 9200"
-0x1002	0x5d57	"Card:ATI Radeon X800XT"
-0x1002	0x7834	"Card:ATI Radeon 9100 PRO IGP"
-0x1002	0x7835	"Card:ATI Radeon Mobility 9200 IGP"
-0x100b	0x0020	"natsemi"
-0x100b	0x0022	"ns83820"
-0x100c	0x3202	"Card:ET4000 W32i, W32p (generic)"
-0x100c	0x3205	"Card:ET4000 W32i, W32p (generic)"
-0x100c	0x3206	"Card:ET4000 W32i, W32p (generic)"
-0x100c	0x3207	"Card:ET4000 W32i, W32p (generic)"
-0x100c	0x3208	"Card:ET6000 (generic)"
-0x100c	0x4702	"Card:ET6300 (generic)"
-0x100e	0x9000	"Card:Weitek P9100 (generic)"
-0x100e	0x9001	"Card:Weitek P9100 (generic)"
-0x100e	0x9002	"Card:Weitek P9100 (generic)"
-0x100e	0x9100	"Card:Weitek P9100 (generic)"
-0x1011	0x0002	"tulip"
-0x1011	0x0004	"Card:Digital 8-plane TGA (UDB/Multia)"
-0x1011	0x0009	"tulip"
-0x1011	0x0014	"tulip"
-0x1011	0x0019	"tulip"
-0x1011	0x001a	"acenic"
-0x1011	0x0046	0x0e11	0x4050	"cpqarray"
-0x1011	0x0046	0x0e11	0x4051	"cpqarray"
-0x1011	0x0046	0x0e11	0x4058	"cpqarray"
-0x1011	0x0046	0x103c	0x10c2	"aacraid"
-0x1011	0x0046	0x9005	0x0365	"aacraid"
-0x1011	0x0046	0x9005	0x1364	"aacraid"
-0x1011	0x0046	0x9005	0x1365	"aacraid"
-0x1013	0x0038	"Card:Cirrus Logic GD754x (laptop)"
-0x1013	0x00a0	"Card:Cirrus Logic GD543x"
-0x1013	0x00a2	"Card:Cirrus Logic GD543x"
-0x1013	0x00a4	"Card:Cirrus Logic GD543x"
-0x1013	0x00a8	"Card:Cirrus Logic GD543x"
-0x1013	0x00ac	"Card:Cirrus Logic GD543x"
-0x1013	0x00b0	"Card:Cirrus Logic GD544x"
-0x1013	0x00b8	"Card:Cirrus Logic GD544x"
-0x1013	0x00bc	"Card:Cirrus Logic GD5480"
-0x1013	0x00d0	"Card:Cirrus Logic GD5462"
-0x1013	0x00d2	"Card:Cirrus Logic GD5462"
-0x1013	0x00d4	"Card:Cirrus Logic GD5464"
-0x1013	0x00d5	"Card:Cirrus Logic GD5464"
-0x1013	0x00d6	"Card:Cirrus Logic GD5465"
-0x1013	0x00e8	"Card:Cirrus Logic GD543x"
-0x1013	0x1200	"Card:Cirrus Logic GD754x (laptop)"
-0x1013	0x1202	"Card:Cirrus Logic GD754x (laptop)"
-0x1013	0x1204	"Card:Cirrus Logic GD754x (laptop)"
-0x1013	0x6001	0x1014	0x1010	"unknown"
-0x1014	0x002e	"ips"
-0x1014	0x01bd	"ips"
-0x101a	0x0005	"hp100"
-0x101e	0x1960	"megaraid_mbox"
-0x101e	0x1960	0x1028	0x0471	"megaraid_mbox"
-0x101e	0x1960	0x1028	0x0475	"megaraid_mbox"
-0x101e	0x1960	0x1028	0x0493	"megaraid_mbox"
-0x101e	0x1960	0x1028	0x0511	"megaraid_mbox"
-0x101e	0x9010	"megaraid"
-0x101e	0x9060	"megaraid"
-0x1022	0x2000	"pcnet32"
-0x1022	0x2001	"pcnet32"
-0x1022	0x2020	"tmscsim"
-0x1022	0x7462	"amd8111e"
-0x1023	0x2100	"Card:Trident CyberBlade (generic)"
-0x1023	0x8400	"Card:Trident CyberBlade (generic)"
-0x1023	0x8420	"Card:Trident CyberBlade (generic)"
-0x1023	0x8500	"Card:Trident CyberBlade (generic)"
-0x1023	0x8520	"Card:Trident CyberBlade (generic)"
-0x1023	0x8600	"Card:Trident CyberBlade (generic)"
-0x1023	0x8620	"Card:Trident CyberBlade (generic)"
-0x1023	0x8820	"Card:Trident CyberBlade (generic)"
-0x1023	0x9320	"Card:Trident Cyber 9320 (generic)"
-0x1023	0x9382	"Card:Trident Cyber 9382 (generic)"
-0x1023	0x9385	"Card:Trident Cyber 9385 (generic)"
-0x1023	0x9388	"Card:Trident Cyber 9388 (generic)"
-0x1023	0x9397	"Card:Trident Cyber 9397 (generic)"
-0x1023	0x939a	"Card:Trident Cyber 9397 (generic)"
-0x1023	0x9420	"Card:Trident TGUI9420DGi (generic)"
-0x1023	0x9430	"Card:Trident TGUI9430DGi (generic)"
-0x1023	0x9440	"Card:Trident TGUI9440 (generic)"
-0x1023	0x9520	"Card:Trident Cyber 9520 (generic)"
-0x1023	0x9525	"Card:Trident Cyber 9525 (generic)"
-0x1023	0x9540	"Card:Trident CyberBlade (generic)"
-0x1023	0x9660	"Card:Trident TGUI9660 (generic)"
-0x1023	0x9680	"Card:Trident TGUI9680 (generic)"
-0x1023	0x9682	"Card:Trident TGUI9682 (generic)"
-0x1023	0x9685	"Card:Trident TGUI9685 (generic)"
-0x1023	0x9750	"Card:Trident 3DImage975 (generic)"
-0x1023	0x9759	"Card:Trident 3DImage975 (generic)"
-0x1023	0x9850	"Card:Trident 3DImage985 (generic)"
-0x1023	0x9880	"Card:Trident Blade3D (generic)"
-0x1023	0x9910	"Card:Trident CyberBladeXP"
-0x1023	0x9930	"Card:Trident CyberBladeXPm"
-0x1028	0x0001	"aacraid"
-0x1028	0x0002	"aacraid"
-0x1028	0x0003	"aacraid"
-0x1028	0x0004	"aacraid"
-0x1028	0x000a	"aacraid"
-0x1028	0x000e	"megaraid_mbox"
-0x1028	0x000f	"megaraid_mbox"
-0x102b	0x0010	"Card:Matrox Millennium"
-0x102b	0x0518	"Card:Matrox Millennium"
-0x102b	0x0519	"Card:Matrox Millennium"
-0x102b	0x051a	"Card:Matrox Mystique"
-0x102b	0x051b	"Card:Matrox Millennium II"
-0x102b	0x051e	"Card:Matrox Mystique"
-0x102b	0x051f	"Card:Matrox Millennium II"
-0x102b	0x0520	"Card:Matrox Millennium G200"
-0x102b	0x0521	"Card:Matrox Millennium G200"
-0x102b	0x0525	"Card:Matrox Millennium G400"
-0x102b	0x0525	0x102b	0x0541	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0542	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0641	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0642	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x07c0	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x07c1	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0d41	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0d42	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0e00	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0e01	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0e02	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0e03	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0f80	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0f81	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0f82	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x102b	0x0f83	"Card:Matrox Millennium G450"
-0x102b	0x0525	0x1705	0x0001	"Card:Matrox Millennium G450"
-0x102b	0x0d10	"Card:VESA driver (generic)"
-0x102b	0x1000	"Card:Matrox Productiva G100"
-0x102b	0x1001	"Card:Matrox Productiva G100"
-0x102b	0x2007	"Card:Matrox Millennium"
-0x102b	0x2527	"Card:Matrox Millennium G550"
-0x102c	0x00b8	"Card:Chips & Technologies CT64300"
-0x102c	0x00c0	"Card:Chips & Technologies CT69000"
-0x102c	0x00d0	"Card:Chips & Technologies CT65545"
-0x102c	0x00d8	"Card:Chips & Technologies CT65545"
-0x102c	0x00dc	"Card:Chips & Technologies CT65548"
-0x102c	0x00e0	"Card:Chips & Technologies CT65550"
-0x102c	0x00e4	"Card:Chips & Technologies CT65554"
-0x102c	0x00e5	"Card:Chips & Technologies CT65555"
-0x102c	0x00f0	"Card:Chips & Technologies CT68554"
-0x102c	0x00f4	"Card:Chips & Technologies CT68554"
-0x102c	0x0c30	"Card:Chips & Technologies CT69030"
-0x1036	0x0000	"fdomain"
-0x1039	0x0200	"Card:SiS 5597/5598"
-0x1039	0x0205	"Card:SiS SG86C205"
-0x1039	0x0300	"Card:SiS 300/305"
-0x1039	0x0310	"Card:SiS 315H"
-0x1039	0x0315	"Card:SiS 315"
-0x1039	0x0325	"Card:SiS 315Pro"
-0x1039	0x0330	"Card:SiS 330 Xabre"
-0x1039	0x0340	"Card:SiS 340"
-0x1039	0x0900	"sis900"
-0x1039	0x5300	"Card:SiS 540"
-0x1039	0x5315	"Card:SiS 550"
-0x1039	0x5597	"Card:SiS 5597"
-0x1039	0x6236	"Card:SiS 6326"
-0x1039	0x6300	"Card:SiS 630/730"
-0x1039	0x6306	"Card:SiS 530/620"
-0x1039	0x6325	"Card:SiS 650/M650/651/740"
-0x1039	0x6326	"Card:SiS 6326"
-0x1039	0x6330	"Card:SiS 660/661FX/M661FX/M661MX/741/741GX/M741/760/M760"
-0x1039	0x7016	"sis900"
-0x103c	0x1030	"hp100"
-0x103c	0x1031	"hp100"
-0x1043	0x0675	"hisax"
-0x1048	0x1000	"hisax"
-0x1048	0x3000	"hisax"
-0x104a	0x0981	"tulip"
-0x104a	0x2774	"tulip"
-0x104b	0x0140	"BusLogic"
-0x104b	0x1040	"BusLogic"
-0x104b	0x8130	"BusLogic"
-0x104c	0x3d07	"Card:3Dlabs Permedia2 (generic)"
-0x1050	0x0000	"ne2k-pci"
-0x1050	0x0840	"winbond-840"
-0x1050	0x0940	"ne2k-pci"
-0x1050	0x5a5a	"ne2k-pci"
-0x105d	0x2309	"Card:Number Nine Imagine 128 (2-8MB)"
-0x105d	0x2339	"Card:Number Nine Imagine 128 Series 2 (2-4MB)"
-0x105d	0x493d	"Card:Number Nine Imagine 128 T2R"
-0x105d	0x5348	"Card:Number Nine Revolution IV (T2R4)"
-0x1069	0x0001	"DAC960"
-0x1069	0x0002	"DAC960"
-0x1069	0x0010	"DAC960"
-0x1069	0x0050	"DAC960"
-0x1069	0xba55	"DAC960"
-0x1069	0xba56	"DAC960"
-0x106b	0x0021	"sungem"
-0x106b	0x0024	"sungem"
-0x1077	0x1020	"qlogicisp"
-0x1077	0x1216	0x101e	0x8471	"ignore"
-0x1077	0x1216	0x101e	0x8493	"ignore"
-0x1078	0x0000	"Card:Cyrix MediaGX"
-0x1078	0x0002	"Card:NatSemi Geode"
-0x1078	0x0104	"Card:Cyrix MediaGX"
-0x108d	0x0012	"tlan"
-0x108d	0x0013	"tlan"
-0x108d	0x0014	"tlan"
-0x108e	0x1001	"sunhme"
-0x108e	0x1101	"sungem"
-0x108e	0x2bad	"sungem"
-0x1092	0x00a0	"Card:Diamond SpeedStar Pro SE (CL-GD5430/5434)"
-0x1092	0x00a8	"Card:Diamond SpeedStar 64"
-0x1092	0x0550	"Card:Diamond Viper 550"
-0x1092	0x1092	"Card:Diamond Viper 330"
-0x1092	0x8811	"Card:Diamond Stealth 64 DRAM SE"
-0x109e	0x0350	"bttv"
-0x109e	0x0351	"bttv"
-0x109e	0x0369	"bttv"
-0x109e	0x036c	"bttv"
-0x109e	0x036e	"bttv"
-0x109e	0x036f	"bttv"
-0x109e	0x0370	"bttv"
-0x10a8	0x0000	"Card:STB Horizon"
-0x10a9	0x0009	"acenic"
-0x10b4	0x1b1d	"Card:STB Systems Velocity 3D"
-0x10b7	0x0001	"acenic"
-0x10b7	0x4500	"3c59x"
-0x10b7	0x5055	"3c59x"
-0x10b7	0x5057	"3c59x"
-0x10b7	0x5157	"3c59x"
-0x10b7	0x5257	"3c59x"
-0x10b7	0x5900	"3c59x"
-0x10b7	0x5920	"3c59x"
-0x10b7	0x5950	"3c59x"
-0x10b7	0x5951	"3c59x"
-0x10b7	0x5952	"3c59x"
-0x10b7	0x5970	"3c59x"
-0x10b7	0x5b57	"3c59x"
-0x10b7	0x6055	"3c59x"
-0x10b7	0x6056	"3c59x"
-0x10b7	0x6560	"3c59x"
-0x10b7	0x6561	"3c59x"
-0x10b7	0x6562	"3c59x"
-0x10b7	0x6563	"3c59x"
-0x10b7	0x6564	"3c59x"
-0x10b7	0x7646	"3c59x"
-0x10b7	0x7770	"orinoco_plx"
-0x10b7	0x9000	"3c59x"
-0x10b7	0x9001	"3c59x"
-0x10b7	0x9004	"3c59x"
-0x10b7	0x9005	"3c59x"
-0x10b7	0x9006	"3c59x"
-0x10b7	0x900a	"3c59x"
-0x10b7	0x9050	"3c59x"
-0x10b7	0x9051	"3c59x"
-0x10b7	0x9055	"3c59x"
-0x10b7	0x9056	"3c59x"
-0x10b7	0x9058	"3c59x"
-0x10b7	0x905a	"3c59x"
-0x10b7	0x9200	"3c59x"
-0x10b7	0x9201	"3c59x"
-0x10b7	0x9800	"3c59x"
-0x10b7	0x9805	"3c59x"
-0x10b7	0x9900	"typhoon"
-0x10b7	0x9902	"typhoon"
-0x10b7	0x9903	"typhoon"
-0x10b7	0x9904	"typhoon"
-0x10b7	0x9905	"typhoon"
-0x10b7	0x9908	"typhoon"
-0x10b7	0x9909	"typhoon"
-0x10b7	0x990a	"typhoon"
-0x10b7	0x990b	"typhoon"
-0x10b8	0x0005	"epic100"
-0x10b8	0x0006	"epic100"
-0x10b9	0x5261	"dmfe"
-0x10bd	0x0e34	"ne2k-pci"
-0x10c8	0x0001	"Card:NeoMagic MagicGraph 128 (laptop/notebook)"
-0x10c8	0x0002	"Card:NeoMagic MagicGraph 128V (laptop/notebook)"
-0x10c8	0x0003	"Card:NeoMagic MagicGraph 128ZV (laptop/notebook)"
-0x10c8	0x0004	"Card:NeoMagic MagicGraph 128XD (laptop/notebook)"
-0x10c8	0x0005	"Card:NeoMagic MagicMedia 256AV (laptop/notebook)"
-0x10c8	0x0006	"Card:NeoMagic MagicMedia 256ZX (laptop/notebook)"
-0x10c8	0x0016	"Card:NeoMagic MagicMedia 256XL+ (laptop/notebook)"
-0x10c8	0x0025	"Card:NeoMagic MagicMedia 256AV+ (laptop/notebook)"
-0x10c8	0x0083	"Card:NeoMagic MagicGraph 128ZV+ (laptop/notebook)"
-0x10d9	0x0512	"tulip"
-0x10d9	0x0531	"tulip"
-0x10de	0x0008	"Card:Diamond Edge 3D"
-0x10de	0x0009	"Card:Diamond Edge 3D"
-0x10de	0x0020	"Card:RIVA TNT"
-0x10de	0x0028	"Card:RIVA TNT2"
-0x10de	0x0029	"Card:RIVA TNT2"
-0x10de	0x002a	"Card:RIVA TNT2"
-0x10de	0x002b	"Card:RIVA TNT2"
-0x10de	0x002c	"Card:RIVA TNT2"
-0x10de	0x002d	"Card:RIVA TNT2"
-0x10de	0x002e	"Card:RIVA TNT2"
-0x10de	0x002f	"Card:RIVA TNT2"
-0x10de	0x0040	"Card:NVIDIA GeForce 6800 Ultra"
-0x10de	0x0041	"Card:NVIDIA GeForce 6800"
-0x10de	0x0042	"Card:NVIDIA GeForce 6800 LE"
-0x10de	0x0043	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0045	"Card:NVIDIA GeForce 6800 GT"
-0x10de	0x0049	"Card:NVIDIA Unknown (generic)"
-0x10de	0x004d	"Card:NVIDIA Quadro FX 4400"
-0x10de	0x004e	"Card:NVIDIA Quadro FX 4000"
-0x10de	0x0066	"forcedeth"
-0x10de	0x00a0	"Card:RIVA TNT2"
-0x10de	0x00c0	"Card:NVIDIA Unknown (generic)"
-0x10de	0x00c1	"Card:NVIDIA Unknown (generic)"
-0x10de	0x00c2	"Card:NVIDIA GeForce 6800 LE"
-0x10de	0x00c8	"Card:NVIDIA Unknown (generic)"
-0x10de	0x00c9	"Card:NVIDIA Unknown (generic)"
-0x10de	0x00cc	"Card:NVIDIA Unknown (generic)"
-0x10de	0x00ce	"Card:NVIDIA Unknown (generic)"
-0x10de	0x00d6	"forcedeth"
-0x10de	0x0100	"Card:NVIDIA GeForce 256 (generic)"
-0x10de	0x0101	"Card:NVIDIA GeForce 256 (generic)"
-0x10de	0x0103	"Card:NVIDIA GeForce 256 (generic)"
-0x10de	0x0110	"Card:NVIDIA GeForce 2 MX (generic)"
-0x10de	0x0111	"Card:NVIDIA GeForce 2 MX (generic)"
-0x10de	0x0112	"Card:nVidia GeForce 2 Go"
-0x10de	0x0113	"Card:NVIDIA GeForce 2 MX (generic)"
-0x10de	0x0140	"Card:NVIDIA GeForce 6600 GT"
-0x10de	0x0141	"Card:NVIDIA GeForce 6600"
-0x10de	0x0142	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0143	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0144	"Card:NVIDIA GeForce Go 6600"
-0x10de	0x0145	"Card:NVIDIA GeForce 6610 XL"
-0x10de	0x0146	"Card:NVIDIA GeForce Go 6600 TE/6200 TE"
-0x10de	0x0147	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0148	"Card:NVIDIA GeForce Go 6600"
-0x10de	0x0149	"Card:NVIDIA Unknown (generic)"
-0x10de	0x014b	"Card:NVIDIA Unknown (generic)"
-0x10de	0x014c	"Card:NVIDIA Unknown (generic)"
-0x10de	0x014d	"Card:NVIDIA Unknown (generic)"
-0x10de	0x014e	"Card:NVIDIA Quadro FX 540"
-0x10de	0x014f	"Card:NVIDIA GeForce 6200"
-0x10de	0x0150	"Card:NVIDIA GeForce 2 GTS (generic)"
-0x10de	0x0151	"Card:NVIDIA GeForce 2 GTS (generic)"
-0x10de	0x0152	"Card:NVIDIA GeForce 2 GTS (generic)"
-0x10de	0x0153	"Card:NVIDIA GeForce 2 GTS (generic)"
-0x10de	0x0170	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0160	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0166	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0171	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0172	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0173	"Card:NVIDIA GeForce 2 MX (generic)"
-0x10de	0x0174	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0175	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0176	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0177	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0178	"Card:NVIDIA GeForce 2 MX (generic)"
-0x10de	0x0179	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x017a	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x017b	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x017c	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x017d	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0181	"Card:NVIDIA GeForce 4 MX (generic)"
-0x10de	0x0182	"Card:NVIDIA GeForce 4 MX (generic)"
-0x10de	0x0183	"Card:NVIDIA GeForce 4 MX (generic)"
-0x10de	0x0185	"Card:NVIDIA GeForce 4 MX (generic)"
-0x10de	0x0186	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0187	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0188	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x018a	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x018b	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x018c	"Card:NVIDIA Quadro NVS 50 PCI"
-0x10de	0x018d	"Card:NVIDIA GeForce4 448 Go"
-0x10de	0x01a0	"Card:NVIDIA GeForce 2 MX (generic)"
-0x10de	0x01c3	"forcedeth"
-0x10de	0x01f0	"Card:NVIDIA GeForce 4 MX (generic)"
-0x10de	0x0200	"Card:NVIDIA GeForce 3 (generic)"
-0x10de	0x0201	"Card:NVIDIA GeForce 3 (generic)"
-0x10de	0x0202	"Card:NVIDIA GeForce 3 (generic)"
-0x10de	0x0203	"Card:NVIDIA GeForce 2 MX (generic)"
-0x10de	0x0210	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0211	"Card:NVIDIA Unknown (generic)"
-0x10de	0x021d	"Card:NVIDIA Unknown (generic)"
-0x10de	0x021e	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0250	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0251	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0252	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0253	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0258	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x0259	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x025b	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x0280	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0281	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0282	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0286	"Card:NVIDIA GeForce 4 (generic)"
-0x10de	0x0288	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x0289	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x028c	"Card:NVIDIA Quadro 4 (generic)"
-0x10de	0x0300	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0301	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0302	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0308	"Card:NVIDIA Quadro FX (generic)"
-0x10de	0x0309	"Card:NVIDIA Quadro FX (generic)"
-0x10de	0x0311	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0312	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0313	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0314	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0316	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0317	"Card:NVIDIA Unknown (generic)"
-0x10de	0x031a	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x031b	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x031c	"Card:NVIDIA Quadro FX (generic)"
-0x10de	0x031d	"Card:NVIDIA Unknown (generic)"
-0x10de	0x031e	"Card:NVIDIA Unknown (generic)"
-0x10de	0x031f	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0320	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0321	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0322	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0323	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0324	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0325	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0326	"Card:NVIDIA GeForce FX 5500"
-0x10de	0x0327	"Card:NVIDIA GeForce FX 5100"
-0x10de	0x0328	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0329	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x032a	"Card:NVIDIA Quadro FX (generic)"
-0x10de	0x032b	"Card:NVIDIA Quadro FX (generic)"
-0x10de	0x032c	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x032d	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x032f	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0330	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0331	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0332	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0333	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0334	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0338	"Card:NVIDIA Quadro FX (generic)"
-0x10de	0x033f	"Card:NVIDIA Quadro FX 700"
-0x10de	0x0341	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0342	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0343	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0344	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0345	"Card:NVIDIA Unknown (generic)"
-0x10de	0x0347	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0348	"Card:NVIDIA GeForce FX (generic)"
-0x10de	0x0349	"Card:NVIDIA Unknown (generic)"
-0x10de	0x034b	"Card:NVIDIA Unknown (generic)"
-0x10de	0x034c	"Card:NVIDIA Quadro FX (generic)"
-0x10de	0x034e	"Card:NVIDIA Quadro FX (generic)"
-0x10de	0x034f	"Card:NVIDIA Unknown (generic)"
-0x10ec	0x8029	"ne2k-pci"
-0x10ec	0x8129	"8139too"
-0x10ec	0x8138	"8139too"
-0x10ec	0x8139	"8139too"
-0x10ec	0x8169	"r8169"
-0x1101	0x1060	"a100u2w"
-0x1106	0x0926	"ne2k-pci"
-0x1106	0x3022	"Card:S3 UniChrome"
-0x1106	0x3043	"via-rhine"
-0x1106	0x3053	"via-rhine"
-0x1106	0x3065	"via-rhine"
-0x1106	0x3106	"via-rhine"
-0x1106	0x3122	"Card:S3 UniChrome"
-0x1106	0x3204	"Card:S3 UniChrome"
-0x1106	0x3205	"Card:S3 UniChrome"
-0x1106	0x6100	"via-rhine"
-0x1106	0x7204	"Card:S3 UniChrome"
-0x1106	0x7205	"Card:S3 UniChrome"
-0x1113	0x1211	"8139too"
-0x1113	0x1216	"tulip"
-0x1113	0x1217	"tulip"
-0x1113	0x9511	"tulip"
-0x1119	0x0000	"gdth"
-0x1119	0x0001	"gdth"
-0x1119	0x0002	"gdth"
-0x1119	0x0003	"gdth"
-0x1119	0x0004	"gdth"
-0x1119	0x0005	"gdth"
-0x1119	0x0006	"gdth"
-0x1119	0x0007	"gdth"
-0x1119	0x0008	"gdth"
-0x1119	0x0009	"gdth"
-0x1119	0x000a	"gdth"
-0x1119	0x000b	"gdth"
-0x1119	0x000c	"gdth"
-0x1119	0x000d	"gdth"
-0x1119	0x0100	"gdth"
-0x1119	0x0101	"gdth"
-0x1119	0x0102	"gdth"
-0x1119	0x0103	"gdth"
-0x1119	0x0104	"gdth"
-0x1119	0x0105	"gdth"
-0x1119	0x0110	"gdth"
-0x1119	0x0111	"gdth"
-0x1119	0x0112	"gdth"
-0x1119	0x0113	"gdth"
-0x1119	0x0114	"gdth"
-0x1119	0x0115	"gdth"
-0x1119	0x0118	"gdth"
-0x1119	0x0119	"gdth"
-0x1119	0x011a	"gdth"
-0x1119	0x011b	"gdth"
-0x1119	0x0120	"gdth"
-0x1119	0x0121	"gdth"
-0x1119	0x0122	"gdth"
-0x1119	0x0123	"gdth"
-0x1119	0x0124	"gdth"
-0x1119	0x0125	"gdth"
-0x1119	0x0136	"gdth"
-0x1119	0x0137	"gdth"
-0x1119	0x0138	"gdth"
-0x1119	0x0139	"gdth"
-0x1119	0x013a	"gdth"
-0x1119	0x013b	"gdth"
-0x1119	0x013c	"gdth"
-0x1119	0x013d	"gdth"
-0x1119	0x013e	"gdth"
-0x1119	0x013f	"gdth"
-0x1119	0x0166	"gdth"
-0x1119	0x0167	"gdth"
-0x1119	0x0168	"gdth"
-0x1119	0x0169	"gdth"
-0x1119	0x016a	"gdth"
-0x1119	0x016b	"gdth"
-0x1119	0x016c	"gdth"
-0x1119	0x016d	"gdth"
-0x1119	0x016e	"gdth"
-0x1119	0x016f	"gdth"
-0x1119	0x01d6	"gdth"
-0x1119	0x01d7	"gdth"
-0x1119	0x01f6	"gdth"
-0x1119	0x01f7	"gdth"
-0x1119	0x01fc	"gdth"
-0x1119	0x01fd	"gdth"
-0x1119	0x01fe	"gdth"
-0x1119	0x01ff	"gdth"
-0x1119	0x0210	"gdth"
-0x1119	0x0211	"gdth"
-0x1119	0x0260	"gdth"
-0x1119	0x0261	"gdth"
-0x1119	0x0300	"gdth"
-0x111a	0x0000	"eni"
-0x111a	0x0002	"eni"
-0x1133	0xe002	"hisax"
-0x1133	0xe004	"hisax"
-0x1133	0xe005	"hisax"
-0x1142	0x6422	"Card:Alliance ProMotion 6422"
-0x1142	0x643d	"Card:AT3D"
-0x1148	0x4000	"skfp"
-0x114f	0x0003	"dgrs"
-0x114f	0x0070	"hisax"
-0x114f	0x0071	"hisax"
-0x114f	0x0072	"hisax"
-0x114f	0x0073	"hisax"
-0x115d	0x0003	"xircom_cb"
-0x115d	0x0005	"xircom_cb"
-0x115d	0x0007	"xircom_cb"
-0x115d	0x000b	"xircom_cb"
-0x115d	0x000f	"xircom_cb"
-0x115d	0x0101	"xircom_cb"
-0x115d	0x0103	"xircom_cb"
-0x1163	0x0001	"Card:Rendition Verite 1000"
-0x1163	0x2000	"Card:Rendition Verite 2x00"
-0x1186	0x1002	"sundance"
-0x1186	0x1300	"8139too"
-0x1186	0x1340	"8139too"
-0x1186	0x1561	"tulip"
-0x1186	0x4000	"dl2k"
-0x1191	0x8002	"atp870u"
-0x1191	0x8010	"atp870u"
-0x1191	0x8020	"atp870u"
-0x1191	0x8030	"atp870u"
-0x1191	0x8040	"atp870u"
-0x1191	0x8050	"atp870u"
-0x119e	0x0001	"firestream"
-0x119e	0x0003	"firestream"
-0x11ad	0x0002	"tulip"
-0x11ad	0xc115	"tulip"
-0x11de	0x6057	"zr36067"
-0x11de	0x6120	"hisax"
-0x11f6	0x0112	"hp100"
-0x11f6	0x1401	"ne2k-pci"
-0x11f6	0x2011	"winbond-840"
-0x11f6	0x2201	"ne2k-pci"
-0x11f6	0x9881	"tulip"
-0x121a	0x0001	"Card:Voodoo Graphics"
-0x121a	0x0002	"Card:Voodoo II"
-0x121a	0x0003	"Card:Banshee (generic)"
-0x121a	0x0004	"Card:Banshee (generic)"
-0x121a	0x0005	"Card:Voodoo3 (generic)"
-0x121a	0x0009	"Card:Voodoo5 (generic)"
-0x1244	0x0700	"b1pci"
-0x1244	0x1200	"t1pci"
-0x1259	0xa117	"8139too"
-0x125b	0x1400	"tulip"
-0x1260	0x3873	"orinoco_pci"
-0x126f	0x0710	"Card:Silicon Motion LynxEM"
-0x126f	0x0712	"Card:Silicon Motion Lynx (generic)"
-0x126f	0x0720	"Card:Silicon Motion Lynx (generic)"
-0x126f	0x0730	"Card:Silicon Motion Lynx (generic)"
-0x126f	0x0810	"Card:Silicon Motion Lynx (generic)"
-0x126f	0x0811	"Card:Silicon Motion Lynx (generic)"
-0x126f	0x0820	"Card:Silicon Motion Lynx (generic)"
-0x126f	0x0910	"Card:Silicon Motion Lynx (generic)"
-0x1282	0x9009	"dmfe"
-0x1282	0x9100	"dmfe"
-0x1282	0x9102	"dmfe"
-0x1282	0x9132	"dmfe"
-0x12ae	0x0001	"acenic"
-0x12ae	0x0002	"acenic"
-0x12ae	0x00fa	"acenic"
-0x12c3	0x0058	"ne2k-pci"
-0x12c3	0x5598	"ne2k-pci"
-0x12d2	0x0008	"Server:SVGA"
-0x12d2	0x0018	"Card:RIVA128"
-0x12d2	0x0019	"Card:RIVA128"
-0x12d2	0x0020	"Card:RIVA TNT"
-0x12d2	0x0028	"Card:RIVA TNT2"
-0x12d2	0x0029	"Card:RIVA TNT2"
-0x12d2	0x002c	"Card:RIVA TNT2"
-0x12d2	0x00a0	"Card:RIVA TNT2"
-0x1317	0x0981	"tulip"
-0x1317	0x0985	"tulip"
-0x1317	0x1985	"tulip"
-0x1317	0x9511	"tulip"
-0x1318	0x0911	"hamachi"
-0x1332	0x5415	"umem"
-0x1385	0x4100	"orinoco_plx"
-0x1385	0x620a	"acenic"
-0x1385	0x630a	"acenic"
-0x1397	0x2bd0	"hisax"
-0x13c1	0x1000	"3w-xxxx"
-0x13c1	0x1001	"3w-xxxx"
-0x13c1	0x1002	"3w-9xxx"
-0x13d1	0xab02	"tulip"
-0x13d1	0xab06	"8139too"
-0x13f0	0x0201	"sundance"
-0x1400	0x1401	"epic100"
-0x14b9	0x0001	"airo"
-0x14b9	0x0340	"airo"
-0x14b9	0x0350	"airo"
-0x14b9	0x4500	"airo"
-0x14b9	0x4800	"airo"
-0x14e4	0x4401	"b44"
-0x14e4	0x4402	"b44"
-0x14ea	0xab06	"8139too"
-0x14ea	0xab07	"8139too"
-0x1500	0x1360	"8139too"
-0x1516	0x0803	"fealnx"
-0x1516	0x0891	"fealnx"
-0x15ad	0x0405	"Card:VMWare"
-0x15ad	0x0710	"Card:VMWare"
-0x15e8	0x0130	"orinoco_plx"
-0x1638	0x1100	"orinoco_plx"
-0x16ab	0x1100	"orinoco_plx"
-0x16ab	0x1101	"orinoco_plx"
-0x16ab	0x1102	"orinoco_plx"
-0x16ec	0x3685	"orinoco_plx"
-0x1743	0x8139	"8139too"
-0x3d3d	0x0002	"Card:ELSA GLoria-L"
-0x3d3d	0x0004	"Card:3Dlabs Permedia2 (generic)"
-0x3d3d	0x0005	"Card:3Dlabs Permedia2 (generic)"
-0x3d3d	0x0006	"Card:ELSA GLoria-L/MX"
-0x3d3d	0x0009	"Card:3Dlabs Permedia2 (generic)"
-0x3d3d	0x000a	"Card:3Dlabs Permedia2 (generic)"
-0x3d3d	0x0100	"Card:3Dlabs Permedia2 (generic)"
-0x3d3d	0x1004	"Card:3Dlabs Permedia2 (generic)"
-0x3d3d	0x3d04	"Card:3Dlabs Permedia2 (generic)"
-0x4005	0x2301	"Card:Avance Logic 2301"
-0x4005	0x2302	"Card:Avance Logic 2302"
-0x4005	0x2303	"Card:Avance Logic 2302"
-0x4033	0x1360	"8139too"
-0x4a14	0x5000	"ne2k-pci"
-0x5301	0x0001	"Card:AT3D"
-0x5333	0x5631	"Card:S3 ViRGE (generic)"
-0x5333	0x8801	"Card:S3 Vision964 (generic)"
-0x5333	0x8810	"Card:S3 Trio32 (generic)"
-0x5333	0x8811	"Card:S3 Trio64 (generic)"
-0x5333	0x8812	"Card:S3 Aurora64V+ (generic)"
-0x5333	0x8813	"Card:S3 Trio32 (generic)"
-0x5333	0x8814	"Card:S3 Trio64V+ (generic)"
-0x5333	0x8815	"Card:S3 Aurora64V+ (generic)"
-0x5333	0x883d	"Card:S3 ViRGE (generic)"
-0x5333	0x8880	"Card:S3 868 (generic)"
-0x5333	0x8881	"Card:S3 868 (generic)"
-0x5333	0x8882	"Card:S3 868 (generic)"
-0x5333	0x8883	"Card:S3 868 (generic)"
-0x5333	0x88b0	"Card:S3 928 (generic)"
-0x5333	0x88b1	"Card:S3 86C928 (generic)"
-0x5333	0x88b2	"Card:S3 86C928 (generic)"
-0x5333	0x88b3	"Card:S3 86C928 (generic)"
-0x5333	0x88c0	"Card:S3 864 (generic)"
-0x5333	0x88c1	"Card:S3 864 (generic)"
-0x5333	0x88c2	"Card:S3 864 (generic)"
-0x5333	0x88c3	"Card:S3 864 (generic)"
-0x5333	0x88d0	"Card:S3 964 (generic)"
-0x5333	0x88d1	"Card:S3 964 (generic)"
-0x5333	0x88d2	"Card:S3 964 (generic)"
-0x5333	0x88d3	"Card:S3 964 (generic)"
-0x5333	0x88f0	"Card:S3 968 (generic)"
-0x5333	0x88f1	"Card:S3 968 (generic)"
-0x5333	0x88f2	"Card:S3 968 (generic)"
-0x5333	0x88f3	"Card:S3 968 (generic)"
-0x5333	0x8900	"Card:S3 Trio64V2 (generic)"
-0x5333	0x8901	"Card:S3 Trio64V2 (generic)"
-0x5333	0x8903	"Card:S3 Trio3D"
-0x5333	0x8904	"Card:S3 Trio3D"
-0x5333	0x8904	0x1014	0x00db	"Card:S3 Trio64 3D"
-0x5333	0x8904	0x1014	0x305c	"Card:S3 Trio64 3D"
-0x5333	0x8905	"Card:S3 Trio64V+ (generic)"
-0x5333	0x8906	"Card:S3 Trio64V+ (generic)"
-0x5333	0x8907	"Card:S3 Trio64V+ (generic)"
-0x5333	0x8908	"Card:S3 Trio64V+ (generic)"
-0x5333	0x8909	"Card:S3 Trio64V+ (generic)"
-0x5333	0x890a	"Card:S3 Trio64V+ (generic)"
-0x5333	0x890b	"Card:S3 Trio64V+ (generic)"
-0x5333	0x890c	"Card:S3 Trio64V+ (generic)"
-0x5333	0x890d	"Card:S3 Trio64V+ (generic)"
-0x5333	0x890e	"Card:S3 Trio64V+ (generic)"
-0x5333	0x890f	"Card:S3 Trio64V+ (generic)"
-0x5333	0x8a01	"Card:S3 ViRGE (generic)"
-0x5333	0x8a10	"Card:S3 ViRGE/GX2 (generic)"
-0x5333	0x8a13	"Card:S3 Trio3D/2X"
-0x5333	0x8a20	"Card:S3 Savage3D"
-0x5333	0x8a21	"Card:S3 Savage3D"
-0x5333	0x8a22	"Card:S3 Savage4"
-0x5333	0x8a23	"Card:S3 Savage4"
-0x5333	0x8a25	"Card:S3 ProSavage PM133"
-0x5333	0x8a26	"Card:S3 ProSavage KM133"
-0x5333	0x8c01	"Card:S3 ViRGE/MX (generic)"
-0x5333	0x8c02	"Card:S3 ViRGE/MX+ (generic)"
-0x5333	0x8c03	"Card:S3 ViRGE/MX (generic)"
-0x5333	0x8c10	"Card:S3 Savage/MX"
-0x5333	0x8c11	"Card:S3 Savage/MX"
-0x5333	0x8c12	"Card:S3 Savage/IX"
-0x5333	0x8c13	"Card:S3 Savage/IX"
-0x5333	0x8c22	"Card:S3 Savage/MX"
-0x5333	0x8c24	"Card:S3 Savage/MX"
-0x5333	0x8c26	"Card:S3 Savage/MX"
-0x5333	0x8c2a	"Card:S3 Savage/IX"
-0x5333	0x8c2b	"Card:S3 Savage/IX"
-0x5333	0x8c2c	"Card:S3 Savage/IX"
-0x5333	0x8c2d	"Card:S3 Savage/IX"
-0x5333	0x8c2e	"Card:S3 Savage/IX"
-0x5333	0x8c2f	"Card:S3 Savage/IX"
-0x5333	0x8d01	"Card:S3 ProSavage PN133"
-0x5333	0x8d02	"Card:S3 ProSavage KN133"
-0x5333	0x8d03	"Card:S3 ProSavage PM133"
-0x5333	0x8d04	"Card:S3 ProSavage KM133"
-0x5333	0x9102	"Card:S3 Savage 2000 (generic)"
-0x8086	0x0039	"tulip"
-0x8086	0x0600	"gdth"
-0x8086	0x1000	"e1000"
-0x8086	0x1001	"e1000"
-0x8086	0x1002	"e100"
-0x8086	0x1004	"e1000"
-0x8086	0x1008	"e1000"
-0x8086	0x1009	"e1000"
-0x8086	0x100c	"e1000"
-0x8086	0x100d	"e1000"
-0x8086	0x100e	"e1000"
-0x8086	0x100f	"e1000"
-0x8086	0x1010	"e1000"
-0x8086	0x1011	"e1000"
-0x8086	0x1012	"e1000"
-0x8086	0x1013	"e1000"
-0x8086	0x1015	"e1000"
-0x8086	0x1016	"e1000"
-0x8086	0x1017	"e1000"
-0x8086	0x1019	"e1000"
-0x8086	0x101d	"e1000"
-0x8086	0x101e	"e1000"
-0x8086	0x1029	"e100"
-0x8086	0x1030	"e100"
-0x8086	0x1031	"e100"
-0x8086	0x1032	"e100"
-0x8086	0x1033	"e100"
-0x8086	0x1034	"e100"
-0x8086	0x1038	"e100"
-0x8086	0x1039	"e100"
-0x8086	0x103a	"e100"
-0x8086	0x103b	"e100"
-0x8086	0x103c	"e100"
-0x8086	0x103d	"e100"
-0x8086	0x103e	"e100"
-0x8086	0x1050	"e100"
-0x8086	0x1051	"e100"
-0x8086	0x1059	"e100"
-0x8086	0x1132	"Card:Intel 815"
-0x8086	0x1209	"e100"
-0x8086	0x1229	"e100"
-0x8086	0x1960	0x101e	0x0438	"megaraid"
-0x8086	0x1960	0x101e	0x0466	"megaraid"
-0x8086	0x1960	0x101e	0x0467	"megaraid"
-0x8086	0x1960	0x101e	0x09a0	"megaraid"
-0x8086	0x1960	0x1028	0x0467	"megaraid"
-0x8086	0x1960	0x1028	0x1111	"megaraid"
-0x8086	0x1960	0x103c	0x03a2	"megaraid"
-0x8086	0x1960	0x103c	0x10c6	"megaraid"
-0x8086	0x1960	0x103c	0x10c7	"megaraid"
-0x8086	0x1960	0x103c	0x10cc	"megaraid"
-0x8086	0x1960	0x103c	0x10cd	"megaraid"
-0x8086	0x1960	0x1111	0x1111	"megaraid"
-0x8086	0x1960	0x113c	0x03a2	"megaraid"
-0x8086	0x2449	"e100"
-0x8086	0x2459	"e100"
-0x8086	0x245d	"e100"
-0x8086	0x24d1	"ata_piix"
-0x8086	0x2562	"Card:Intel 845"
-0x8086	0x2572	"Card:Intel 865"
-0x8086	0x2582	"Card:Intel 915"
-0x8086	0x2652	"ata_piix"
-0x8086	0x2653	"ata_piix"
-0x8086	0x3092	"i2o_block"
-0x8086	0x3577	"Card:Intel 830"
-0x8086	0x3582	"Card:Intel 852"
-0x8086	0x7121	"Card:Intel 810"
-0x8086	0x7123	"Card:Intel 810"
-0x8086	0x7125	"Card:Intel 810"
-0x8086	0x7800	"Card:Intel 740 (generic)"
-0x8086	0x9621	"i2o_block"
-0x8086	0x9622	"i2o_block"
-0x8086	0x9641	"i2o_block"
-0x8086	0x96a1	"i2o_block"
-0x8e2e	0x3000	"ne2k-pci"
-0x9004	0x1078	"aic7xxx"
-0x9004	0x2178	"aic7xxx"
-0x9004	0x3860	"aic7xxx"
-0x9004	0x5075	"aic7xxx"
-0x9004	0x5078	"aic7xxx"
-0x9004	0x5175	"aic7xxx"
-0x9004	0x5178	"aic7xxx"
-0x9004	0x5275	"aic7xxx"
-0x9004	0x5278	"aic7xxx"
-0x9004	0x5375	"aic7xxx"
-0x9004	0x5378	"aic7xxx"
-0x9004	0x5475	"aic7xxx"
-0x9004	0x5478	"aic7xxx"
-0x9004	0x5575	"aic7xxx"
-0x9004	0x5578	"aic7xxx"
-0x9004	0x5675	"aic7xxx"
-0x9004	0x5678	"aic7xxx"
-0x9004	0x5775	"aic7xxx"
-0x9004	0x5778	"aic7xxx"
-0x9004	0x6038	"aic7xxx"
-0x9004	0x6075	"aic7xxx"
-0x9004	0x6078	"aic7xxx"
-0x9004	0x6178	"aic7xxx"
-0x9004	0x6278	"aic7xxx"
-0x9004	0x6378	"aic7xxx"
-0x9004	0x6478	"aic7xxx"
-0x9004	0x6578	"aic7xxx"
-0x9004	0x6678	"aic7xxx"
-0x9004	0x6778	"aic7xxx"
-0x9004	0x6915	"starfire"
-0x9004	0x7078	"aic7xxx"
-0x9004	0x7178	"aic7xxx"
-0x9004	0x7278	"aic7xxx"
-0x9004	0x7378	"aic7xxx"
-0x9004	0x7478	"aic7xxx"
-0x9004	0x7578	"aic7xxx"
-0x9004	0x7678	"aic7xxx"
-0x9004	0x7778	"aic7xxx"
-0x9004	0x7810	"aic7xxx"
-0x9004	0x7850	"aic7xxx"
-0x9004	0x7855	"aic7xxx"
-0x9004	0x7860	"aic7xxx"
-0x9004	0x7870	"aic7xxx"
-0x9004	0x7871	"aic7xxx"
-0x9004	0x7872	"aic7xxx"
-0x9004	0x7873	"aic7xxx"
-0x9004	0x7874	"aic7xxx"
-0x9004	0x7880	"aic7xxx"
-0x9004	0x7890	"aic7xxx"
-0x9004	0x7891	"aic7xxx"
-0x9004	0x7892	"aic7xxx"
-0x9004	0x7893	"aic7xxx"
-0x9004	0x7894	"aic7xxx"
-0x9004	0x7895	"aic7xxx"
-0x9004	0x7896	"aic7xxx"
-0x9004	0x7897	"aic7xxx"
-0x9004	0x8078	"aic7xxx"
-0x9004	0x8178	"aic7xxx"
-0x9004	0x8278	"aic7xxx"
-0x9004	0x8378	"aic7xxx"
-0x9004	0x8478	"aic7xxx"
-0x9004	0x8578	"aic7xxx"
-0x9004	0x8678	"aic7xxx"
-0x9004	0x8778	"aic7xxx"
-0x9004	0x8878	"aic7xxx"
-0x9005	0x0010	"aic7xxx"
-0x9005	0x0011	"aic7xxx"
-0x9005	0x0013	"aic7xxx"
-0x9005	0x001f	"aic7xxx"
-0x9005	0x0020	"aic7xxx"
-0x9005	0x002f	"aic7xxx"
-0x9005	0x0030	"aic7xxx"
-0x9005	0x003f	"aic7xxx"
-0x9005	0x0050	"aic7xxx"
-0x9005	0x0051	"aic7xxx"
-0x9005	0x005f	"aic7xxx"
-0x9005	0x0080	"aic7xxx"
-0x9005	0x0081	"aic7xxx"
-0x9005	0x0083	"aic7xxx"
-0x9005	0x008f	"aic7xxx"
-0x9005	0x00c0	"aic7xxx"
-0x9005	0x00c1	"aic7xxx"
-0x9005	0x00c3	"aic7xxx"
-0x9005	0x00cf	"aic7xxx"
-0x9005	0x0250	"ips"
-0x9005	0x0283	"aacraid"
-0x9005	0x0284	"aacraid"
-0x9005	0x0285	"aacraid"
-0x9005	0x0285	0x1028	0x0287	"aacraid"
-0x9005	0x0286	"aacraid"
-0x9005	0x8000	"aic79xx"
-0x9005	0x800f	"aic79xx"
-0x9005	0x8010	"aic79xx"
-0x9005	0x8011	"aic79xx"
-0x9005	0x8012	"aic79xx"
-0x9005	0x8013	"aic79xx"
-0x9005	0x8014	"aic79xx"
-0x9005	0x801d	"aic79xx"
-0x9005	0x801e	"aic79xx"
-0x9005	0x801f	"aic79xx"
-0x9005	0x8080	"aic79xx"
-0x9005	0x808f	"aic79xx"
-0x9005	0x8090	"aic79xx"
-0x9005	0x8091	"aic79xx"
-0x9005	0x8092	"aic79xx"
-0x9005	0x8093	"aic79xx"
-0x9005	0x8094	"aic79xx"
-0x9005	0x8095	"aic79xx"
-0x9005	0x8096	"aic79xx"
-0x9005	0x8097	"aic79xx"
-0x9005	0x809c	"aic79xx"
-0x9005	0x809d	"aic79xx"
-0x9005	0x809e	"aic79xx"
-0x9005	0x809f	"aic79xx"
-0xe159	0x0001	"hisax"
-0xec80	0xec00	"orinoco_plx"
-0xedd8	0xa091	"Card:Ark Logic ARK1000PV (generic)"
-0xedd8	0xa099	"Card:Ark Logic ARK2000MT (generic)"
-0xedd8	0xa0a1	"Card:Ark Logic ARK2000MT (generic)"
-# custom Kanotix additions
-# graphics card
-0x1039	0x6330	"Card:SiS 6326"
-# hostap
-0x1260	0x3873	0x1186	0x3700	"hostap_pci"
-# ndiswrapper
-0x1260	0x3890	0x1113	0xee03	"ndiswrapper"
-0x1260	0x3890	0x1385	0x4800	"ndiswrapper"
-# snd-intel8x0 extra
-0x10de	0x006b	"snd-intel8x0"
-# custom Kanotix blacklist
-0x1244	0x0a00	"kanotix"
-0x1244	0x0e00	"kanotix"
-# automatically created
-0x14e4	0x1644	"tg3"
-0x14e4	0x1645	"tg3"
-0x14e4	0x1646	"tg3"
-0x14e4	0x1647	"tg3"
-0x14e4	0x1648	"tg3"
-0x14e4	0x164d	"tg3"
-0x14e4	0x1653	"tg3"
-0x14e4	0x1654	"tg3"
-0x14e4	0x165d	"tg3"
-0x14e4	0x165e	"tg3"
-0x14e4	0x16a6	"tg3"
-0x14e4	0x16a7	"tg3"
-0x14e4	0x16a8	"tg3"
-0x14e4	0x16c6	"tg3"
-0x14e4	0x16c7	"tg3"
-0x14e4	0x1696	"tg3"
-0x14e4	0x169c	"tg3"
-0x14e4	0x169d	"tg3"
-0x14e4	0x170d	"tg3"
-0x14e4	0x170e	"tg3"
-0x14e4	0x1649	"tg3"
-0x14e4	0x166e	"tg3"
-0x14e4	0x1658	"tg3"
-0x14e4	0x1659	"tg3"
-0x14e4	0x1676	"tg3"
-0x14e4	0x1677	"tg3"
-0x14e4	0x167c	"tg3"
-0x14e4	0x167d	"tg3"
-0x14e4	0x167e	"tg3"
-0x14e4	0x16f7	"tg3"
-0x14e4	0x16fd	"tg3"
-0x14e4	0x16fe	"tg3"
-0x14e4	0x16dd	"tg3"
-0x1148	0x4400	"tg3"
-0x1148	0x4500	"tg3"
-0x173b	0x03e8	"tg3"
-0x173b	0x03e9	"tg3"
-0x173b	0x03eb	"tg3"
-0x173b	0x03ea	"tg3"
-0x106b	0x1645	"tg3"
-0x10b7	0x1700	"sk98lin"
-0x10b7	0x80eb	"sk98lin"
-0x1148	0x4300	"sk98lin"
-0x1148	0x4320	"sk98lin"
-0x1148	0x9000	"sk98lin"
-0x1148	0x9e00	"sk98lin"
-0x1186	0x4b00	"sk98lin"
-0x1186	0x4b01	"sk98lin"
-0x1186	0x4c00	"sk98lin"
-0x11ab	0x4320	"sk98lin"
-0x11ab	0x4340	"sk98lin"
-0x11ab	0x4341	"sk98lin"
-0x11ab	0x4342	"sk98lin"
-0x11ab	0x4343	"sk98lin"
-0x11ab	0x4344	"sk98lin"
-0x11ab	0x4345	"sk98lin"
-0x11ab	0x4346	"sk98lin"
-0x11ab	0x4347	"sk98lin"
-0x11ab	0x4350	"sk98lin"
-0x11ab	0x4351	"sk98lin"
-0x11ab	0x4360	"sk98lin"
-0x11ab	0x4361	"sk98lin"
-0x11ab	0x4362	"sk98lin"
-0x11ab	0x5005	"sk98lin"
-0x1371	0x434e	"sk98lin"
-0x1737	0x1032	"sk98lin"
-0x1737	0x1064	"sk98lin"
-0x8086	0x2415	"snd-intel8x0"
-0x8086	0x2425	"snd-intel8x0"
-0x8086	0x2445	"snd-intel8x0"
-0x8086	0x2485	"snd-intel8x0"
-0x8086	0x24c5	"snd-intel8x0"
-0x8086	0x24d5	"snd-intel8x0"
-0x8086	0x25a6	"snd-intel8x0"
-0x8086	0x266e	"snd-intel8x0"
-0x8086	0x27de	"snd-intel8x0"
-0x8086	0x7195	"snd-intel8x0"
-0x1039	0x7012	"snd-intel8x0"
-0x10de	0x01b1	"snd-intel8x0"
-0x10de	0x003a	"snd-intel8x0"
-0x10de	0x006a	"snd-intel8x0"
-0x10de	0x0059	"snd-intel8x0"
-0x10de	0x008a	"snd-intel8x0"
-0x10de	0x00da	"snd-intel8x0"
-0x10de	0x00ea	"snd-intel8x0"
-0x1022	0x746d	"snd-intel8x0"
-0x1022	0x7445	"snd-intel8x0"
-0x10b9	0x5455	"snd-intel8x0"
-0x1013	0x6005	"snd-cs4281"
-0x5333	0xca00	"snd-sonicvibes"
-0x1002	0x4341	"snd-atiixp"
-0x1002	0x4361	"snd-atiixp"
-0x1002	0x4370	"snd-atiixp"
-0x4005	0x4000	"snd-als4000"
-0x1319	0x0801	"snd-fm801"
-0x13f6	0x0100	"snd-cmipci"
-0x13f6	0x0101	"snd-cmipci"
-0x13f6	0x0111	"snd-cmipci"
-0x13f6	0x0112	"snd-cmipci"
-0x10b9	0x0111	"snd-cmipci"
-0x1073	0x0004	"snd-ymfpci"
-0x1073	0x000d	"snd-ymfpci"
-0x1073	0x000a	"snd-ymfpci"
-0x1073	0x000c	"snd-ymfpci"
-0x1073	0x0010	"snd-ymfpci"
-0x1073	0x0012	"snd-ymfpci"
-0x1412	0x1724	"snd-ice1724"
-0x1412	0x1712	"snd-ice1712"
-0x10b9	0x5451	"snd-ali5451"
-0x10ee	0x3fc0	"snd-rme96"
-0x10ee	0x3fc1	"snd-rme96"
-0x10ee	0x3fc2	"snd-rme96"
-0x10ee	0x3fc3	"snd-rme96"
-0xea60	0x9896	"snd-rme32"
-0xea60	0x9898	"snd-rme32"
-0xea60	0x9897	"snd-rme32"
-0x1285	0x0100	"snd-es1968"
-0x125d	0x1968	"snd-es1968"
-0x125d	0x1978	"snd-es1968"
-0x125d	0x1969	"snd-es1938"
-0x1057	0x0003	"snd-mixart"
-0x1023	0x2000	"snd-trident"
-0x1023	0x2001	"snd-trident"
-0x1039	0x7018	"snd-trident"
-0x1274	0x1371	"snd-ens1371"
-0x1274	0x5880	"snd-ens1371"
-0x1102	0x8938	"snd-ens1371"
-0x1274	0x5000	"snd-ens1370"
-0x1013	0x6001	"snd-cs46xx"
-0x1013	0x6003	"snd-cs46xx"
-0x1013	0x6004	"snd-cs46xx"
-0x1102	0x0007	"snd-ca0106"
-0x12eb	0x0002	"snd-au8830"
-0x12eb	0x0001	"snd-au8820"
-0x12eb	0x0003	"snd-au8810"
-0x125d	0x1988	"snd-maestro3"
-0x125d	0x1989	"snd-maestro3"
-0x125d	0x1990	"snd-maestro3"
-0x125d	0x1992	"snd-maestro3"
-0x125d	0x1998	"snd-maestro3"
-0x125d	0x1999	"snd-maestro3"
-0x125d	0x199a	"snd-maestro3"
-0x125d	0x199b	"snd-maestro3"
-0x122d	0x50dc	"snd-azt3328"
-0x122d	0x80da	"snd-azt3328"
-0x1102	0x0006	"snd-emu10k1x"
-0x1102	0x0002	"snd-emu10k1"
-0x1102	0x0004	"snd-emu10k1"
-0x1102	0x0008	"snd-emu10k1"
-0x10b5	0x906d	"snd-korg1212"
-0x1106	0x3058	"snd-via82xx"
-0x1106	0x3059	"snd-via82xx"
-0x10ee	0x3fc4	"snd-rme9652"
-0x10ee	0x3fc5	"snd-hdsp"
-0x10b5	0x9050	"snd-vx222"
-0x10b5	0x9030	"snd-vx222"
-0x10c8	0x8005	"snd-nm256"
-0x10c8	0x8006	"snd-nm256"
-0x10c8	0x8016	"snd-nm256"
-0x8086	0x2668	"snd-hda-intel"
-0x8086	0x27d8	"snd-hda-intel"
+0x0001	0x1002	"bttv"	"ATI|TV Wonder"
+0x0001	0x1461	"bttv"	"AVerMedia|TVPhone98"
+0x0002	0x1461	"bttv"	"Avermedia|TVCapture 98"
+0x0003	0x1002	"bttv"	"ATI|TV Wonder/VE"
+0x0003	0x1461	"bttv"	"AVerMedia|TVPhone98"
+0x0004	0x1461	"bttv"	"AVerMedia|TVPhone98"
+0x0101	0x15cb	"bttv"	"AG GMV1"
+0x0675	0x1700	"hisax"	"Dynalink|IS64PH ISDN Adapter"
+0x0675	0x1702	"hisax"	"Dynalink|IS64PH ISDN Adapter"
+0x0871	0xffa1	"hisax"	"German telekom|A1T"
+0x0871	0xffa2	"hisax"	"German telekom|T-Concept"
+0x0e11	0x0508	"sktr"	"Compaq|Netelligent 4/16 Token Ring"
+0x0e11	0x3033	"Server:XF86_SVGA"	"QVision 1280/p"
+0x0e11	0xae10	"cpqarray"	"Compaq|Smart-2/P RAID Controller"
+0x0e11	0xb060	"cciss"	"Compaq|Smart Array 5300 Controller"
+0x0e11	0x4058	"cpqarray"	"Compaq|Smart Array SA431"
+0x0e11	0x4051	"cpqarray"	"Compaq|Smart Array SA4250ES"
+0x0e11	0x4050	"cpqarray"	"Compaq|Smart Array SA4200"
+0x0e11	0x4048	"cpqarray"	"Compaq|Smart Array LC2"
+0x0e11	0x4040	"cpqarray"	"Compaq|Integrated Array"
+0x0e11	0x4034	"cpqarray"	"Compaq|Smart Array 221"
+0x0e11	0x4033	"cpqarray"	"Compaq|Smart Array 3100ES"
+0x0e11	0x4032	"cpqarray"	"Compaq|Smart Array 3200"
+0x0e11	0x4031	"cpqarray"	"Compaq|Smart Array 2SL"
+0x0e11	0x4030	"cpqarray"	"Compaq|Smart Array 2P"
+0x1000	0x0001	"53c7,8xx"	"Symbios|53c810"
+0x1000	0x0002	"sym53c8xx"	"Symbios|53c820"
+0x1000	0x0003	"sym53c8xx"	"Symbios|53c825"
+0x1000	0x0004	"sym53c8xx"	"Symbios|53c815"
+0x1000	0x0005	"sym53c8xx"	"Symbios|53c810AP"
+0x1000	0x0006	"sym53c8xx"	"Symbios|53c860"
+0x1000	0x000a	"sym53c8xx"	"Symbios|53c1510"
+0x1000	0x000b	"sym53c8xx"	"Symbios|53c896"
+0x1000	0x000c	"sym53c8xx"	"Symbios|53c895"
+0x1000	0x000d	"sym53c8xx"	"Symbios|53c885"
+0x1000	0x000f	"sym53c8xx"	"Symbios|53c875"
+0x1000	0x0010	"cpqarray"	"Symbios|53c1510 Array Mode [Compaq Integrated Smart Array]"
+0x1000	0x0012	"sym53c8xx"	"Symbios|53c895a"
+0x1000	0x0020	"sym53c8xx"	"Symbios|53c1010-33 Ultra3 SCSI Adapter"
+0x1000	0x0021	"sym53c8xx"	"Symbios|53c1010-66 Ultra3 SCSI Adapter"
+0x1000	0x008f	"sym53c8xx"	"Symbios|53c875J"
+0x1000	0x0701	"yellowfin"	"Symbios|83C885 gigabit ethernet"
+0x1000	0x0702	"yellowfin"	"Symbios|Yellowfin G-NIC gigabit ethernet"
+0x1002	0x4158	"Server:Xorg(ati)"	"Mach64 68800AX [Mach32]"
+0x1002	0x4173	"Server:Xorg(radeon)"	"Ati Radeon Mobility"
+0x1002	0x4336	"Server:Xorg(vesa)"	"Ati Radeon Mobility 320M [only Vesa supported]"
+0x1002	0x4164	"Server:Xorg(radeon)"	"ATI|Radeon R300 Secondary (DVI) output"
+0x1002	0x4354	"Server:Xorg(ati)"	"Mach64 215CT [Mach64 CT]"
+0x1002	0x4358	"Server:Xorg(ati)"	"Mach64 210888CX [Mach64 CX]"
+0x1002	0x4554	"Server:Xorg(ati)"	"Mach64 210888ET [Mach64 ET]"
+0x1002	0x4654	"Server:Xorg(ati)"	"Mach64 Mach64 VT"
+0x1002	0x4742	"Server:Xorg(ati)"	"Mach64 3D Rage Pro AGP 1X/2X"
+0x1002	0x4744	"Server:Xorg(ati)"	"Mach64 3D Rage Pro AGP 1X"
+0x1002	0x4747	"Server:Xorg(ati)"	"Mach64 3D Rage Pro"
+0x1002	0x4749	"Server:Xorg(ati)"	"Mach64 3D Rage Pro"
+0x1002	0x474c	"Server:Xorg(ati)"	"Mach64 Rage XC"
+0x1002	0x474d	"Server:Xorg(ati)"	"Mach64 Rage XL AGP"
+0x1002	0x474e	"Server:Xorg(ati)"	"Mach64 Rage XC AGP"
+0x1002	0x474f	"Server:Xorg(ati)"	"Mach64 Rage XL"
+0x1002	0x4750	"Server:Xorg(ati)"	"Mach64 3D Rage Pro 215GP"
+0x1002	0x4751	"Server:Xorg(ati)"	"Mach64 3D Rage Pro 215GQ"
+0x1002	0x4752	"Server:Xorg(ati)"	"Mach64 Rage XL"
+0x1002	0x4753	"Server:Xorg(ati)"	"Mach64 Rage XC"
+0x1002	0x4754	"Server:Xorg(ati)"	"Mach64 3D RAGE II 3D Rage I/II 215GT [Mach64 GT]"
+0x1002	0x4755	"Server:Xorg(ati)"	"Mach64 3D RAGE II 3D Rage II+ 215GTB [Mach64 GTB]"
+0x1002	0x4756	"Server:Xorg(ati)"	"Mach64 3D RAGE II 3D Rage IIC 215IIC [Mach64 GT IIC]"
+0x1002	0x4757	"Server:Xorg(ati)"	"Mach64 3D Rage IIC 3D Rage IIC AGP"
+0x1002	0x4758	"Server:Xorg(ati)"	"Mach64 210888GX [Mach64 GX]"
+0x1002	0x4759	"Server:Xorg(ati)"	"Mach64 3D Rage IIC 3D Rage IIC"
+0x1002	0x475a	"Server:Xorg(ati)"	"Mach64 3D Rage IIC 3D Rage IIC AGP"
+0x1002	0x4c42	"Server:Xorg(ati)"	"Mach64 3D Rage LT Pro AGP-133"
+0x1002	0x4c44	"Server:Xorg(ati)"	"Mach64 3D Rage LT Pro AGP-66"
+0x1002	0x4c45	"Server:Xorg(ati)"	"Rage Mobility M3 AGP"
+0x1002	0x4c46	"Server:Xorg(ati)"	"Rage Mobility M3 AGP 2x"
+0x1002	0x4c47	"Server:Xorg(ati)"	"Mach64 3D Rage LT-G 215LG"
+0x1002	0x4c49	"Server:Xorg(ati)"	"Mach64 3D Rage LT Pro"
+0x1002	0x4c4d	"Server:Xorg(ati)"	"Rage Mobility P/M AGP 2x"
+0x1002	0x4c4e	"Server:Xorg(ati)"	"Rage Mobility L AGP 2x"
+0x1002	0x4c50	"Server:Xorg(ati)"	"Mach64 3D Rage LT Pro"
+0x1002	0x4c51	"Server:Xorg(ati)"	"Mach64 3D Rage LT Pro"
+0x1002	0x4c52	"Server:Xorg(ati)"	"Rage Mobility P/M AGP"
+0x1002	0x4c53	"Server:Xorg(ati)"	"Rage Mobility L AGP"
+0x1002	0x4c54	"Server:Xorg(ati)"	"Mach64 264LT [Mach64 LT]"
+0x1002	0x4d46	"Server:Xorg(ati)"	"Rage Mobility M4 AGP"
+0x1002	0x4d4c	"Server:Xorg(ati)"	"Rage Mobility M4 AGP"
+0x1002	0x4e46	"Server:Xorg(radeon)"	"ATI|Radeon"
+0x1002	0x4e50	"Server:Xorg(radeon)"	"ATI|Radeon Mobility 9600 M10 (RV350)"
+0x1002	0x4e66	"Server:Xorg(radeon)"	"ATI|Radeon 9600TX [ALDI-PC special]"
+0x1002	0x4966	"Server:Xorg(radeon)"	"ATI|Radeon R250 If [Radeon 9000]"
+0x1002	0x496e	"Server:Xorg(radeon)"	"ATI|Radeon R250 [Radeon 9000] (Secondary)"
+0x1002	0x5041	"Server:Xorg(ati)"	"Rage 128 PA"
+0x1002	0x5042	"Server:Xorg(ati)"	"Rage 128 PB"
+0x1002	0x5043	"Server:Xorg(ati)"	"Rage 128 PC"
+0x1002	0x5044	"Server:Xorg(ati)"	"Rage 128 PD"
+0x1002	0x5045	"Server:Xorg(ati)"	"Rage 128 PE"
+0x1002	0x5046	"Server:Xorg(ati)"	"Rage 128 PF"
+0x1002	0x5047	"Server:Xorg(ati)"	"Rage 128 PG"
+0x1002	0x5048	"Server:Xorg(ati)"	"Rage 128 PH"
+0x1002	0x5049	"Server:Xorg(ati)"	"Rage 128 PI"
+0x1002	0x504a	"Server:Xorg(ati)"	"Rage 128 PJ"
+0x1002	0x504b	"Server:Xorg(ati)"	"Rage 128 PK"
+0x1002	0x504c	"Server:Xorg(ati)"	"Rage 128 PL"
+0x1002	0x504d	"Server:Xorg(ati)"	"Rage 128 PM"
+0x1002	0x504e	"Server:Xorg(ati)"	"Rage 128 PN"
+0x1002	0x504f	"Server:Xorg(ati)"	"Rage 128 PO"
+0x1002	0x5050	"Server:Xorg(ati)"	"Rage 128 PP"
+0x1002	0x5051	"Server:Xorg(ati)"	"Rage 128 PQ"
+0x1002	0x5052	"Server:Xorg(ati)"	"Rage 128 PR"
+0x1002	0x5053	"Server:Xorg(ati)"	"Rage 128 PS"
+0x1002	0x5054	"Server:Xorg(ati)"	"Rage 128 PT"
+0x1002	0x5055	"Server:Xorg(ati)"	"Rage 128 PU"
+0x1002	0x5056	"Server:Xorg(ati)"	"Rage 128 PV"
+0x1002	0x5057	"Server:Xorg(ati)"	"Rage 128 PW"
+0x1002	0x5058	"Server:Xorg(ati)"	"Rage 128 PX"
+0x1002	0x5059	"Server:Xorg(radeon)"	"ATI|Radeon"
+0x1002	0x5144	"Server:Xorg(radeon)"	"ATI|Radeon"
+0x1002	0x5145	"Server:Xorg(radeon)"	"ATI|Radeon QE"
+0x1002	0x5146	"Server:Xorg(radeon)"	"ATI|Radeon QF"
+0x1002	0x5147	"Server:Xorg(radeon)"	"ATI|Radeon QG"
+0x1002	0x5148	"Server:Xorg(radeon)"	"ATI|Radeon QH"
+0x1002	0x5149	"Server:Xorg(radeon)"	"ATI|Radeon QI"
+0x1002	0x514a	"Server:Xorg(radeon)"	"ATI|Radeon QJ"
+0x1002	0x514b	"Server:Xorg(radeon)"	"ATI|Radeon QK"
+0x1002	0x514c	"Server:Xorg(radeon)"	"ATI|Radeon QL"
+0x1002	0x514d	"Server:Xorg(radeon)"	"ATI|Radeon QM"
+0x1002	0x514e	"Server:Xorg(radeon)"	"ATI|Radeon QN"
+0x1002	0x514f	"Server:Xorg(radeon)"	"ATI|Radeon QO"
+0x1002	0x5150	"Server:Xorg(radeon)"	"ATI|Radeon QP"
+0x1002	0x5151	"Server:Xorg(radeon)"	"ATI|Radeon QQ"
+0x1002	0x5152	"Server:Xorg(radeon)"	"ATI|Radeon QR"
+0x1002	0x5153	"Server:Xorg(radeon)"	"ATI|Radeon QS"
+0x1002	0x5154	"Server:Xorg(radeon)"	"ATI|Radeon QT"
+0x1002	0x5155	"Server:Xorg(radeon)"	"ATI|Radeon QU"
+0x1002	0x5156	"Server:Xorg(radeon)"	"ATI|Radeon QV"
+0x1002	0x5157	"Server:Xorg(radeon)"	"ATI|Radeon QW"
+0x1002	0x5158	"Server:Xorg(radeon)"	"ATI|Radeon QX"
+0x1002	0x5159	"Server:Xorg(radeon)"	"ATI|Radeon QY"
+0x1002	0x5245	"Server:Xorg(ati)"	"Rage 128 RE"
+0x1002	0x5246	"Server:Xorg(ati)"	"Rage 128 RF"
+0x1002	0x524b	"Server:Xorg(ati)"	"Rage 128 RK"
+0x1002	0x524c	"Server:Xorg(ati)"	"Rage 128 RL"
+0x1002	0x5345	"Server:Xorg(ati)"	"Rage 128 SE"
+0x1002	0x5346	"Server:Xorg(ati)"	"Rage 128 SF"
+0x1002	0x5347	"Server:Xorg(ati)"	"Rage 128 SG"
+0x1002	0x5348	"Server:Xorg(ati)"	"Rage 128 4x"
+0x1002	0x534b	"Server:Xorg(ati)"	"Rage 128 SK"
+0x1002	0x534c	"Server:Xorg(ati)"	"Rage 128 SL"
+0x1002	0x534d	"Server:Xorg(ati)"	"Rage 128 SM"
+0x1002	0x534e	"Server:Xorg(ati)"	"Rage 128 4x"
+0x1002	0x5354	"Server:Xorg(ati)"	"Mach64 Mach 64 VT"
+0x1002	0x5654	"Server:Xorg(ati)"	"Mach64 VT (264VT) 264VT [Mach64 VT]"
+0x1002	0x5655	"Server:Xorg(ati)"	"Mach64 VU (264VT) 264VT3 [Mach64 VT3]"
+0x1002	0x5656	"Server:Xorg(ati)"	"Mach64 VV (264VT) 264VT4 [Mach64 VT4]"
+0x1005	0x2301	"Server:XF86_SVGA"	"2301 ALG2301"
+0x1005	0x2302	"Server:XF86_SVGA"	"2302 ALG2302"
+0x100b	0x0020	"natsemi"	"National Semi|DP83810 10/100 Ethernet"
+0x100b	0xd001	"Server:Xorg(ati)"	"Mach64 87410"
+0x100c	0x3202	"Server:Xorg(tseng)"	"ET4000 W32i, W32p (generic) ET4000/W32p rev A"
+0x100c	0x3205	"Server:Xorg(tseng)"	"ET4000 W32i, W32p (generic) ET4000/W32p rev B"
+0x100c	0x3206	"Server:Xorg(tseng)"	"ET4000 W32i, W32p (generic) ET4000/W32p rev C"
+0x100c	0x3207	"Server:Xorg(tseng)"	"ET4000 W32i, W32p (generic) ET4000/W32p rev D"
+0x100c	0x3208	"Server:Xorg(tseng)"	"ET6000 (generic) ET6000"
+0x100c	0x4702	"Server:Xorg(tseng)"	"ET6000 (generic) ET6300"
+0x100e	0x9000	"Server:XF86_P9000"	"P9000 (Diamond Viper PCI 2MB)"
+0x100e	0x9001	"Server:XF86_P9000"	"P9000 (Diamond Viper PCI 2MB)"
+0x100e	0x9100	"Server:XF86_SVGA"	"P9100 (Diamond Viper PCI 2MB)"
+0x1011	0x0001	"tulip"	"DEC|DECchip 21050"
+0x1011	0x0002	"de4x5"	"DEC|DECchip 21040 [Tulip]"
+0x1011	0x0004	"Server:Xorg(tga)"	"8-plane TGA (UDB/Multia) DECchip 21030 [TGA]"
+0x1011	0x0009	"tulip"	"DEC|DECchip 21140 [FasterNet]"
+0x1011	0x000d	"Server:Xorg(tga)"	"8-plane TGA (UDB/Multia) PBXGB [TGA2]"
+0x1011	0x000f	"defxx"	"DEC|DEFPA"
+0x1011	0x0014	"tulip"	"DEC|DECchip 21041 [Tulip Pass 3]"
+0x1011	0x0019	"de4x5"	"DEC|DECchip 21142/43"
+0x1011	0x001a	"acenic"	"Farallon|PN9000SX"
+0x1011	0x0021	"tulip"	"DEC|DECchip 21052"
+0x1011	0x0022	"tulip"	"DEC|DECchip 21150"
+0x1011	0x0025	"tulip"	"DEC|DECchip 21153"
+0x1011	0x0046	"cpqarray"	"DEC|DECchip 21554 [Compaq Smart Array Controller]"
+0x1011	0x1065	"DAC960"	"DEC|RAID Controller"
+0x1013	0x0038	"Server:XF86_SVGA"	"GD754x (laptop) GD 7548"
+0x1013	0x0040	"Server:XF86_SVGA"	"GD754x (laptop) GD 7555 Flat Panel GUI Accelerator"
+0x1013	0x004c	"Server:XF86_SVGA"	"GD754x (laptop) GD 7556 Video/Graphics LCD/CRT Ctrlr"
+0x1013	0x00a0	"Server:Xorg(cirrus)"	"GD543x GD 5430/40 [Alpine]"
+0x1013	0x00a2	"Server:Xorg(cirrus)"	"GD543x GD 5432 [Alpine]"
+0x1013	0x00a4	"Server:Xorg(cirrus)"	"GD543x GD 5434-4 [Alpine]"
+0x1013	0x00a8	"Server:Xorg(cirrus)"	"GD543x GD 5434-8 [Alpine]"
+0x1013	0x00ac	"Server:Xorg(cirrus)"	"GD543x GD 5436 [Alpine]"
+0x1013	0x00b0	"Server:Xorg(cirrus)"	"GD544x GD 5440"
+0x1013	0x00b8	"Server:Xorg(cirrus)"	"GD544x GD 5446"
+0x1013	0x00bc	"Server:Xorg(cirrus)"	"GD5480 GD 5480"
+0x1013	0x00d0	"Server:Xorg(cirrus)"	"GD5462 GD 5462"
+0x1013	0x00d2	"Server:Xorg(cirrus)"	"GD5462 GD 5462 [Laguna I]"
+0x1013	0x00d4	"Server:Xorg(cirrus)"	"GD5464 GD 5464 [Laguna]"
+0x1013	0x00d6	"Server:Xorg(cirrus)"	"GD5465 GD 5465 [Laguna]"
+0x1013	0x00e8	"Server:Xorg(cirrus)"	"GD543x GD 5436U"
+0x1013	0x1200	"Server:XF86_SVGA"	"GD754x (laptop) GD 7542 [Nordic]"
+0x1013	0x1202	"Server:XF86_SVGA"	"GD754x (laptop) GD 7543 [Viking]"
+0x1013	0x1204	"Server:XF86_SVGA"	"GD754x (laptop) GD 7541 [Nordic Light]"
+0x1013	0x6001	"cs46xx"	"CS 4610/11 [CrystalClear SoundFusion Audio Accelerator]"
+0x1013	0x6003	"cs46xx"	"CS 4614/22/24/30 [CrystalClear SoundFusion Audio Accelerator]"
+0x1013	0x6005	"cs4281"	"Crystal CS4281 PCI Audio"
+0x1014	0x002e	"ips"	"IBM|ServeRAID controller"
+0x1014	0x003e	"olympic"	"IBM|16/4 Token ring UTP/STP controller"
+0x1014	0x005c	"eepro100"	"IBM|i82557B 10/100 PCI Ethernet Adapter"
+0x1014	0x007d	"ad1848"	"IBM|3780IDSP [MWave]"
+0x101a	0x0005	"hp100"	"AT&T GIS (NCR)|100VG ethernet"
+0x101e	0x1960	"megaraid"	"AMI|MegaRAID"
+0x101e	0x9010	"megaraid"	"AMI|MegaRAID"
+0x101e	0x9060	"megaraid"	"AMI|MegaRAID"
+0x1022	0x2000	"pcnet32"	"Advanced Micro Devices [AMD]|79c970 [PCnet LANCE]"
+0x1022	0x2001	"pcnet32"	"Advanced Micro Devices [AMD]|79c978 [HomePNA]"
+0x1022	0x2020	"tmscsim"	"Advanced Micro Devices [AMD]|53c974 [PCscsi]"
+0x1023	0x2000	"trident"	"Trident Microsystems|4DWave DX"
+0x1023	0x2001	"trident"	"Trident Microsystems|4DWave NX"
+0x1023	0x8400	"Server:Xorg(trident)"	"CyberBlade (generic) CyberBlade/i7"
+0x1023	0x8420	"Server:Xorg(trident)"	"CyberBlade (generic) CyberBlade/i7d"
+0x1023	0x8500	"Server:Xorg(trident)"	"CyberBlade (generic) CyberBlade/i1"
+0x1023	0x8520	"Server:Xorg(trident)"	"CyberBlade (generic) CyberBlade i1"
+0x1023	0x8620	"Server:Xorg(trident)"	"Trident CyberBlade (rev 5d)"
+0x1023	0x8820	"Server:Xorg(fbdev)"	"Trident Microsystems CyberBlade XPAi1 (rev 82)"
+0x1023	0x9320	"Server:Xorg(trident)"	"Cyber 9320 (generic) Cyber 9320"
+0x1023	0x9382	"Server:Xorg(trident)"	"Cyber 9382 (generic) Cyber 9382 [Reference design]"
+0x1023	0x9385	"Server:Xorg(trident)"	"Cyber 9385 (generic) Cyber 9385 [Reference design]"
+0x1023	0x9388	"Server:Xorg(trident)"	"Cyber 9388 (generic) Cyber 9388"
+0x1023	0x9397	"Server:Xorg(trident)"	"Cyber 9397 (generic) Cyber 9397"
+0x1023	0x939a	"Server:Xorg(trident)"	"Cyber 9397 DVD (generic) Cyber 9397DVD"
+0x1023	0x9420	"Server:Xorg(trident)"	"TGUI9420DGi (generic) TGUI 9420"
+0x1023	0x9430	"Server:XF86_SVGA"	"Trident TGUI9430DGi (generic) TGUI 9430"
+0x1023	0x9440	"Server:Xorg(trident)"	"TGUI9440 (generic) TGUI 9440"
+0x1023	0x9520	"Server:Xorg(trident)"	"Cyber 9520 (generic) Cyber 9520"
+0x1023	0x9525	"Server:Xorg(trident)"	"Cyber 9525 (generic) Cyber 9525"
+0x1023	0x9660	"Server:XF86_SVGA"	"TGUI9660 (generic)|TGUI 9660/968x/968x"
+0x1023	0x9680	"Server:Xorg(trident)"	"TGUI9680 (generic) TGUI 9680"
+0x1023	0x9682	"Server:Xorg(trident)"	"ProVIDIA 9682 (generic) ProVIDIA 9682"
+0x1023	0x9685	"Server:Xorg(trident)"	"ProVIDIA 9686 (generic) ProVIDIA 9685"
+0x1023	0x9750	"Server:Xorg(trident)"	"3DImage975 (generic) 3DImage 975"
+0x1023	0x9850	"Server:Xorg(trident)"	"3DImage985 (generic) 3DImage 985"
+0x1023	0x9880	"Server:Xorg(trident)"	"Blade3D (generic) Blade 3D PCI/AGP"
+0x1023	0x9910	"Server:Xorg(trident)"	"Trident Microsystems|Cyber/BladeXP"
+0x1025	0x5451	"trident"	"Acer Incorporated [ALI]|ALI M5451 PCI AC-Link Controller Audio Device"
+0x102b	0x0010	"Server:Xorg(mga)"	"Millennium 4MB MGA-I [Impression?]"
+0x102b	0x0518	"Server:Xorg(mga)"	"Millennium II 4MB MGA-II [Athena]"
+0x102b	0x0519	"Server:Xorg(mga)"	"Millennium 4MB MGA 2064W [Millennium]"
+0x102b	0x051a	"Server:Xorg(mga)"	"Mystique MGA 1064SG [Mystique]"
+0x102b	0x051b	"Server:Xorg(mga)"	"Millennium II 4MB MGA 2164W [Millennium II]"
+0x102b	0x051e	"Server:Xorg(mga)"	"Mystique MGA 1064SG [Mystique] AGP"
+0x102b	0x051f	"Server:Xorg(mga)"	"Millennium II 4MB MGA 2164W [Millennium II] AGP"
+0x102b	0x0520	"Server:Xorg(mga)"	"Millennium G200 4MB MGA G200"
+0x102b	0x0521	"Server:Xorg(mga)"	"Millennium G200 4MB MGA G200 AGP"
+0x102b	0x0525	"Server:Xorg(mga)"	"Millennium G400 16MB MGA G400 AGP"
+0x102b	0x0525	"Server:Xorg(mga)"	"Millennium G400 16MB MGA G400 AGP"
+0x102b	0x0d10	"Server:Xorg(mga)"	"Mystique MGA Ultima/Impression"
+0x102b	0x0010	"Server:Xorg(mga)"	"Millennium 4MB MGA-I [Impression?]"
+0x102b	0x0010	"Server:Xorg(mga)"	"Millennium 4MB MGA-I [Impression?]"
+0x102b	0x2007	"Server:Xorg(mga)"	"Mystique MGA Mistral"
+0x102c	0x00b8	"Server:Xorg(chips)"	"CT64300 F64310"
+0x102c	0x00c0	"Server:Xorg(chips)"	"CT69000 F69000 HiQVideo"
+0x102c	0x00d0	"Server:Xorg(chips)"	"CT65545 F65545"
+0x102c	0x00d8	"Server:Xorg(chips)"	"CT65545 F65545"
+0x102c	0x00dc	"Server:Xorg(chips)"	"CT65548 F65548"
+0x102c	0x00e0	"Server:Xorg(chips)"	"CT65550 F65550"
+0x102c	0x00e4	"Server:Xorg(fbdev)"	"CT65554 F65554"
+0x102c	0x00e5	"Server:Xorg(chips)"	"CT65555 F65555 HiQVPro"
+0x102c	0x00f0	"Server:Xorg(chips)"	"CT68554 F68554"
+0x102c	0x00f4	"Server:Xorg(chips)"	"CT68554 F68554 HiQVision"
+0x1031	0x5601	"Server:XF86_SVGA"	"DC20 ASIC"
+0x1036	0x0000	"fdomain"	"Future Domain|TMC-18C30 [36C70]"
+0x1039	0x0001	"Server:XF86_SVGA"	"SG86C201 5591/5592 AGP"
+0x1039	0x0002	"Server:XF86_SVGA"	"SG86C201 SG86C202"
+0x1039	0x0200	"Server:XF86_SVGA"	"5598 5597/5598 VGA"
+0x1039	0x0205	"Server:XF86_SVGA"	"SG86C205 SG86C205"
+0x1039	0x0300	"Server:Xorg(sis)"	"SiS|300"
+0x1039	0x0530	"Server:Xorg(sis)"	"530 530 Host"
+0x1039	0x0900	"sis900"	"Silicon Integrated Systems [SiS]|SiS900 10/100 Ethernet"
+0x1039	0x0530	"Server:Xorg(sis)"	"530 530 Host"
+0x1039	0x6236	"Server:Xorg(sis)"	"6326 6236 3D-AGP"
+0x1039	0x6205	"Server:Xorg(sis)"	"Silicon Integrated Systems [SiS]|VGA Controller"
+0x1039	0x6300	"Server:Xorg(sis)"	"630 SiS630 GUI Accelerator+3D"
+0x1039	0x6306	"Server:Xorg(sis)"	"620 6306 3D-AGP"
+0x1039	0x6325	"Server:Xorg(sis)"	"Silicon Integrated Systems [SiS]|SiS650/651/M650/740 PCI/AGP VGA Display Adapter"
+0x1039	0x6326	"Server:Xorg(sis)"	"6326 86C326"
+0x1039	0x7016	"sis900"	"Silicon Integrated Systems [SiS]|SiS900 10/100 Ethernet"
+0x1039	0x7018	"trident"	"Silicon Integrated Systems [SiS]|7018 PCI Audio"
+0x103c	0x1030	"hp100"	"HP|J2585A"
+0x103c	0x1031	"hp100"	"HP|J2585B"
+0x1043	0x0675	"hisax"	"Asuscom/Askey"
+0x1044	0xa400	"eata"	"Distributed Tech|SmartCache/Raid I-IV Controller"
+0x1044	0xa501	"dpt_i2o"	"Distributed Tech|SmartRAID V Controller"
+0x1048	0x1000	"hisax"	"Elsa AG|QuickStep 1000 ISDN Adapter"
+0x1048	0x3000	"hisax"	"Elsa AG|QuickStep 3000 ISDN Adapter"
+0x104b	0x0140	"BusLogic"	"BusLogic|BT-946C (old) [multimaster 01]"
+0x104b	0x1040	"BusLogic"	"BusLogic|BT-946C (BA80C30) [MultiMaster 10]"
+0x104b	0x8130	"BusLogic"	"BusLogic|Flashpoint LT"
+0x104c	0x3d04	"Server:Xorg(glint)"	"3Dlabs Permedia2 (generic) TVP4010 [Permedia]"
+0x104c	0x3d07	"Server:Xorg(glint)"	"3Dlabs Permedia2 (generic) TVP4020 [Permedia 2]"
+0x104e	0x0107	"Server:XF86_SVGA"	"Paradise Accelerator Value OTI-107 [Spitfire]"
+0x1050	0x0000	"ne2k-pci"	"Winbond Electronics Corp|NE2000"
+0x1050	0x0840	"winbond-840"	"Winbond Electronics Corp|W89C840"
+0x1050	0x0940	"ne2k-pci"	"Winbond Electronics Corp|W89C940"
+0x1050	0x5a5a	"ne2k-pci"	"Winbond Electronics Corp|W89C940F"
+0x1050	0x6692	"hisax"	"Winbond Electronics Corp|W6692 ISDN Adapter"
+0x1051	0x0100	"hisax"	"Motorola MC145575|MC145575 ISDN Adapter"
+0x105d	0x2309	"Server:Xorg(i128)"	"Imagine I-128 (2-8MB) Imagine 128"
+0x105d	0x2339	"Server:Xorg(i128)"	"Imagine I-128 Series 2 (2-4MB) Imagine 128-II"
+0x105d	0x493d	"Server:Xorg(i128)"	"Imagine-128-T2R Imagine 128 T2R [Ticket to Ride]"
+0x105d	0x5348	"Server:Xorg(i128)"	"Imagine-128-T2R Revolution 4"
+0x1061	0x0001	"Server:XF86_AGX"	"Spider Black Widow Plus AGX016"
+0x1069	0x0001	"DAC960"	"Mylex Corporation|DAC960P"
+0x1069	0x0002	"DAC960"	"Mylex Corporation|DAC960PD"
+0x1069	0x0010	"DAC960"	"Mylex Corporation|DAC960PX"
+0x1069	0x0020	"DAC960"	"Mylex Corporation|DAC960 V5"
+0x1069	0x0050	"DAC960"	"Mylex Corporation|Raid Adapter (DAC960)"
+0x1069	0xba55	"DAC960"	"Mylex Corporation|eXtremeRAID support Device"
+0x1069	0xba56	"DAC960"	"Mylex Corporation|eXtremeRAID 2000/3000 support Device"
+0x1073	0x0003	"ymfpci"	"Yamaha Corporation|YMF-740"
+0x1073	0x0004	"ymfpci"	"Yamaha Corporation|YMF-724"
+0x1073	0x0005	"ymfpci"	"Yamaha Corp|DS1 Audio"
+0x1073	0x0006	"ymfpci"	"Yamaha Corp|DS1 Audio"
+0x1073	0x0008	"ymfpci"	"Yamaha Corp|DS1 Audio"
+0x1073	0x000c	"ymfpci"	"Yamaha Corporation|YMF-740C [DS-1L Audio Controller]"
+0x1073	0x000d	"ymfpci"	"Yamaha Corporation|YMF-724F [DS-1 Audio Controller]"
+0x1073	0x000a	"ymfpci"	"Yamaha Corp|DS1L Audio"
+0x1073	0x000c	"ymfpci"	"Yamaha Corporation|YMF-740C [DS-1L Audio Controller]"
+0x1073	0x000d	"ymfpci"	"Yamaha Corporation|YMF-724F [DS-1 Audio Controller]"
+0x1073	0x0010	"ymfpci"	"Yamaha Corporation|YMF-744B [DS-1S Audio Controller]"
+0x1073	0x0012	"ymfpci"	"Yamaha Corporation|YMF-754 [DS-1E Audio Controller]"
+0x1073	0x0020	"ymfpci"	"Yamaha Corporation|DS-1 Audio"
+0x1077	0x1016	"qla1280"	"Q Logic|QLA10160"
+0x1077	0x1020	"qlogicisp"	"Q Logic|ISP1020"
+0x1077	0x1022	"qlogicisp"	"Q Logic|ISP1022"
+0x1077	0x1080	"qla1280"	"Q Logic|QLA1080"
+0x1077	0x1216	"qla1280"	"Q Logic|QLA12160"
+0x1077	0x1240	"qla1280"	"Q Logic|QLA1240"
+0x1077	0x1280	"qla1280"	"Q Logic|QLA1280"
+0x1077	0x2100	"qla2x00"	"Q Logic|QLA2100"
+0x1077	0x2200	"qla2x00"	"Q Logic|QLA2200"
+0x1078	0x0001	"Server:XF86_SVGA"	"MediaGX PCI Master"
+0x1078	0x0002	"Server:XF86_SVGA"	"MediaGX 5520 [Cognac]"
+0x1078	0x0104	"Server:XF86_SVGA"	"MediaGX 5530 Video [Kahlua]"
+0x108d	0x0002	"ibmtr"	"Olicom|16/4 Token Ring"
+0x108d	0x0004	"ibmtr"	"Olicom|RapidFire 3139 Token-Ring 16/4 PCI Adapter"
+0x108d	0x0005	"ibmtr"	"Olicom|GoCard 3250 Token-Ring 16/4 CardBus PC Card"
+0x108d	0x0007	"ibmtr"	"Olicom|RapidFire 3141 Token-Ring 16/4 PCI Fiber Adapter"
+0x108e	0x1001	"sunhme"	"Sun|Happy Meal"
+0x1092	0x00a0	"Server:Xorg(cirrus)"	"SpeedStar Pro SE (Cirrus Logic 5430/5434)"
+0x1092	0x00a8	"Server:Xorg(cirrus)"	"SpeedStar 64 (Cirrus Logic 5434)"
+0x1092	0x1092	"Server:Xorg(nv)"	"Viper 330 (NVidia Riva 128)"
+0x1092	0x8810	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth SE"
+0x1092	0x8811	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth 64/SE"
+0x1092	0x8880	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth"
+0x1092	0x8881	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth"
+0x1092	0x88b0	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth 64"
+0x1092	0x88b1	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth 64"
+0x1092	0x88c0	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth 64"
+0x1092	0x88c1	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth 64"
+0x1092	0x88d0	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth 64"
+0x1092	0x88d1	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth 64"
+0x1092	0x88f0	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth 64"
+0x1092	0x88f1	"Server:XF86_SVGA"	"Stealth 64 DRAM SE Stealth 64"
+0x1098	0x0001	"Server:XF86_SVGA"	"QD-8500"
+0x1098	0x0002	"Server:XF86_SVGA"	"QD-8580"
+0x109e	0x0350	"bttv"	"Brooktree Corporation|Bt848 TV with DMA push"
+0x109e	0x0351	"bttv"	"Brooktree Corporation|Bt849A Video capture"
+0x109e	0x036c	"bttv"	"Brooktree Corporation|Bt879(??) Video Capture"
+0x109e	0x036e	"bttv"	"Brooktree Corporation|Bt878"
+0x109e	0x036f	"bttv"	"Brooktree Corporation|Bt879"
+0x109e	0x0878	"bttv"	"Brooktree Corporation|Bt878"
+0x109e	0x0879	"bttv"	"Brooktree Corporation|BtV ??? Video Capture"
+0x109e	0x0880	"bttv"	"Brooktree Corporation|BtV ??? Video Capture"
+0x10a8	0x0000	"Server:XF86_SVGA"	"STB Horizon 64"
+0x10a9	0x0009	"acenic"	"Silicon Graphics|Alteon Gigabit Ethernet"
+0x10b4	0x1b1d	"Server:Xorg(s3virge)"	"Velocity 128 3D"
+0x10b4	0x2636	"bttv"	"STB|???"
+0x10b5	0x1030	"hisax"	"PLX Technology, Inc.|Gazel ISDN Adapter"
+0x10b5	0x1054	"hisax"	"PLX Technology, Inc.|Gazel ISDN Adapter"
+0x10b5	0x1151	"hisax"	"PLX Technology, Inc.|Gazel ISDN Adapter"
+0x10b5	0x1152	"hisax"	"PLX Technology, Inc.|Gazel ISDN Adapter"
+0x10b5	0x1187	"hisax"	"PLX Technology, Inc.|Olitec ISDN Adapter"
+0x10b5	0x2bd0	"hisax"	"PLX Technology, Inc.|Gazel ISDN Adapter"
+0x10b6	0x0002	"abyss"	"Madge Networks|Smart 16/4 PCI Ringnode Mk2"
+0x10b7	0x0001	"acenic"	"3Com Corporation|3c985 1000BaseSX"
+0x10b7	0x3390	"tmspci"	"3Com Corporation|Token Link Velocity"
+0x10b7	0x5055	"3c59x"	"3Com Corporation|3c555 [Megahertz] 10/100 LAN CardBus"
+0x10b7	0x5057	"3c59x"	"3Com Corporation|3c575 [Megahertz] 10/100 LAN CardBus"
+0x10b7	0x5157	"3c59x"	"3Com Corporation|3c575 [Megahertz] 10/100 LAN CardBus"
+0x10b7	0x5257	"3c59x"	"3Com Corporation|3c575 Fast EtherLink XL"
+0x10b7	0x5900	"3c59x"	"3Com Corporation|3c590 10BaseT [Vortex]"
+0x10b7	0x5920	"3c59x"	"3Com Corporation|3c592 EISA 10mbps Demon/Vortex"
+0x10b7	0x5950	"3c59x"	"3Com Corporation|3c595 100BaseTX [Vortex]"
+0x10b7	0x5951	"3c59x"	"3Com Corporation|3c595 100BaseT4 [Vortex]"
+0x10b7	0x5952	"3c59x"	"3Com Corporation|3c595 100Base-MII [Vortex]"
+0x10b7	0x5970	"3c59x"	"3Com Corporation|3c597 EISA Fast Demon/Vortex"
+0x10b7	0x6055	"3c59x"	"3Com Corporation|3c556 10/100 Mini-PCI Adapter [Cyclone]"
+0x10b7	0x6560	"3c59x"	"3Com Corporation|3c575 [Megahertz] 10/100 LAN CardBus"
+0x10b7	0x6562	"3c59x"	"3Com Corporation|3CCFEM656 Cyclone CardBus"
+0x10b7	0x7646	"3c59x"	"3Com Corporation|3cSOHO100-TX [Hurricane]"
+0x10b7	0x9000	"3c59x"	"3Com Corporation|3c900 10BaseT [Boomerang]"
+0x10b7	0x9001	"3c59x"	"3Com Corporation|3c900 Combo [Boomerang]"
+0x10b7	0x9004	"3c59x"	"3Com Corporation|3c900B-TPO [Etherlink XL TPO]"
+0x10b7	0x9005	"3c59x"	"3Com Corporation|3c900B-Combo [Etherlink XL Combo]"
+0x10b7	0x9006	"3c59x"	"3Com Corporation|3c900B-TPC [Etherlink XL TPC]"
+0x10b7	0x900a	"3c59x"	"3Com Corporation|3c900B-FL [Etherlink XL FL]"
+0x10b7	0x9050	"3c59x"	"3Com Corporation|3c905 100BaseTX [Boomerang]"
+0x10b7	0x9051	"3c59x"	"3Com Corporation|3c905 100BaseT4"
+0x10b7	0x9055	"3c59x"	"3Com Corporation|3c905B 100BaseTX [Cyclone]"
+0x10b7	0x9058	"3c59x"	"3Com Corporation|3c905B-Combo [Deluxe Etherlink XL 10/100]"
+0x10b7	0x905a	"3c59x"	"3Com Corporation|3c905B-FX [Fast Etherlink XL FX 10/100]"
+0x10b7	0x9200	"3c59x"	"3Com Corporation|3c905C-TX [Fast Etherlink]"
+0x10b7	0x9800	"3c59x"	"3Com Corporation|3c980-TX [Fast Etherlink XL Server Adapter]"
+0x10b7	0x9805	"3c59x"	"3Com Corporation|3c980-TX [Fast Etherlink XL Server Adapter]"
+0x10b8	0x0005	"epic100"	"Standard Microsystems Corp [SMC]|83C170QF"
+0x10b8	0x0006	"epic100"	"Standard Microsystems Corp [SMC]|LANEPIC"
+0x10b9	0x5451	"trident"	"Acer Laboratories Inc. [ALi]|M5451 PCI South Bridge Audio"
+0x10bd	0x0e34	"ne2k-pci"	"Surecom Technology|NE-34PCI LAN"
+0x10c3	0x1100	"eepro100"	"Samsung Semiconductors, Inc.|Smartether100 SC1100 LAN Adapter (i82557B)"
+0x10c8	0x0001	"Server:Xorg(neomagic)"	"NM2070 [MagicGraph NM2070] (laptop/notebook)"
+0x10c8	0x0002	"Server:Xorg(neomagic)"	"NM2090 [MagicGraph 128V] (laptop/notebook)"
+0x10c8	0x0003	"Server:Xorg(neomagic)"	"NM2093 [MagicGraph 128ZV] (laptop/notebook)"
+0x10c8	0x0004	"Server:Xorg(neomagic)"	"NM2160 [MagicGraph 128XD] (laptop/notebook)"
+0x10c8	0x0005	"Server:Xorg(neomagic)"	"NeoMagic (laptop/notebook)|[MagicMedia 256AV]"
+0x10c8	0x0006	"Server:Xorg(neomagic)"	"NeoMagic (laptop/notebook)|NM2360 [MagicMedia 256ZX]"
+0x10c8	0x0016	"Server:Xorg(neomagic)"	"NeoMagic (laptop/notebook)|[MagicMedia 256XL+]"
+0x10c8	0x0025	"Server:Xorg(neomagic)"	"[MagicMedia 256V+] (laptop/notebook)"
+0x10c8	0x0083	"Server:Xorg(neomagic)"	"[MagicGraph 128ZV Plus] (laptop/notebook)"
+0x10c8	0x8005	"nm256_audio"	"[MagicMedia 256AV Audio]"
+0x10c8	0x8006	"nm256_audio"	"NM2360 [MagicMedia 256ZX Audio]"
+0x10cd	0x1200	"advansys"	"Advanced System Products|ASC1200 [(abp940) Fast SCSI-II]"
+0x10cd	0x1300	"advansys"	"Advanced System Products|ABP940-U / ABP960-U"
+0x10cd	0x2300	"advansys"	"Advanced System Products|ABP940-UW"
+0x10d9	0x0512	"tulip"	"Macronix, Inc. [MXIC]|MX98713"
+0x10d9	0x0531	"tulip"	"Macronix, Inc. [MXIC]|MX987x5"
+0x10d9	0x8625	"tulip"	"Macronix, Inc. [MXIC]|MX86250"
+0x10da	0x0508	"tmspci"	"Compaq IPG-Austin|TC4048 Token Ring 4/16"
+0x10de	0x0008	"Server:Xorg(nv)"	"EDGE 3D [NV1] (Diamond Edge 3D)"
+0x10de	0x0009	"Server:Xorg(nv)"	"EDGE 3D [NV1] (Diamond Edge 3D)"
+0x10de	0x0020	"Server:Xorg(nv)"	"Riva TnT 128 [NV04]"
+0x10de	0x0028	"Server:Xorg(nv)"	"Riva TnT2 [NV5]"
+0x10de	0x0029	"Server:Xorg(nv)"	"Riva TnT2 Ultra [NV5]"
+0x10de	0x002a	"Server:Xorg(nv)"	"Riva TnT2 [NV5]"
+0x10de	0x002b	"Server:Xorg(nv)"	"Riva TnT2 [NV5]"
+0x10de	0x002c	"Server:Xorg(nv)"	"Vanta [NV6]"
+0x10de	0x002d	"Server:Xorg(nv)"	"Vanta [NV6]"
+0x10de	0x002e	"Server:Xorg(nv)"	"Vanta [NV6]"
+0x10de	0x002f	"Server:Xorg(nv)"	"Vanta [NV6]"
+0x10de	0x00a0	"Server:Xorg(nv)"	"Riva TNT2"
+0x10de	0x0100	"Server:Xorg(nv)"	"GeForce 256"
+0x10de	0x0101	"Server:Xorg(nv)"	"GeForce 256 DDR"
+0x10de	0x0103	"Server:Xorg(nv)"	"Quadro (GeForce 256 GL)"
+0x10de	0x0110	"Server:Xorg(nv)"	"NV11 (GeForce)"
+0x10de	0x0111	"Server:Xorg(vesa)"	"NV11 DDR (GeForce)"
+0x10de	0x0112	"Server:Xorg(vesa)"	"NV11 GeForce 2 Go (Notebook)"
+0x10de	0x0113	"Server:Xorg(nv)"	"NV11 GL (GeForce)"
+0x10de	0x0150	"Server:Xorg(nv)"	"NV15 (GeForce2 GTS)"
+0x10de	0x0151	"Server:Xorg(nv)"	"NV15 DDR (GeForce2 GTS)"
+0x10de	0x0152	"Server:Xorg(nv)"	"NV15 Bladerunner (GeForce2 GTS)"
+0x10de	0x0153	"Server:Xorg(nv)"	"NV15 GL (Quadro2)"
+0x10de	0x0167	"Server:Xorg(nv)"	"nVidia"
+0x10de	0x0181	"Server:Xorg(nv)"	"nVidia GeForce 4"
+0x10de	0x0182	"Server:Xorg(nv)"	"nVidia GeForce 4 MX 440"
+0x10de	0x0185	"Server:Xorg(nv)"	"nVidia GeForce 4 MX 440 AGP 8X"
+0x10de	0x0187	"Server:Xorg(fbdev)"	"nVidia GeForce4 488 Go"
+0x10de	0x0200	"Server:Xorg(nv)"	"nVidia Corporation|GeForce3"
+0x10de	0x0201	"Server:Xorg(nv)"	"nVidia Corporation|GeForce3 (rev 1)"
+0x10de	0x0202	"Server:Xorg(nv)"	"nVidia Corporation|GeForce3 (rev 2)"
+0x10de	0x0203	"Server:Xorg(nv)"	"nVidia Corporation|GeForce3 (rev 3)"
+0x10de  0x0281  "Server:Xorg(nv)"    "nVidia Corporation|NV28 [GeForce4 Ti 4200 AGP 8x]"
+0x10de	0x031c	"Server:Xorg(nv)"	"nVidia Quadro FX Go 700"
+0x10e0	0x9128	"Server:Xorg(imstt)"	"Integrated Micro|IMS9129 [Twin turbo 128]"
+0x10e3	0x0000	"Server:XF86_SVGA"	"CA91C042 [Universe]"
+0x10e3	0x0000	"Server:XF86_SVGA"	"CA91C042 [Universe]"
+0x10ea	0x1680	"Server:XF86_SVGA"	"IGA-1680"
+0x10ea	0x1682	"Server:XF86_SVGA"	"IGA-1682"
+0x10ea	0x2000	"cyber2000fb"	"Intergraphics Systems|CyberPro 2000"
+0x10ea	0x2010	"cyber2000fb"	"Intergraphics Systems|CyberPro 2000A"
+0x10ea	0x5000	"cyber2000fb"	"Intergraphics Systems|CyberPro 5000"
+0x10ec	0x8029	"ne2k-pci"	"Realtek|RTL-8029(AS)"
+0x10ec	0x8129	"8139too"	"Realtek|RTL-8129"
+0x10ec	0x8138	"8139too"	"Realtek|RT8139 (B/C) Cardbus Fast Ethernet Adapter"
+0x10ec	0x8139	"8139too"	"Realtek|RTL-8139"
+0x1101	0x0002	"initio"	"Initio Corporation|Ultra SCSI Adapter"
+0x1101	0x1060	"initio"	"Initio Corporation|INI-A100U2W"
+0x1101	0x134a	"initio"	"Initio Corporation|Ultra SCSI Adapter"
+0x1101	0x9100	"initio"	"Initio Corporation|INI-9100/9100W"
+0x1101	0x9400	"initio"	"Initio Corporation|INI-940"
+0x1101	0x9401	"initio"	"Initio Corporation|INI-950"
+0x1101	0x9500	"initio"	"Initio Corporation|360P"
+0x1101	0x9700	"initio"	"Initio Corp|Fast Wide SCSI Controller"
+0x1102	0x0002	"emu10k1"	"SB Live! EMU10000"
+0x1102	0x0004	"emu10k1"	"Creative Labs|SB Audigy"
+0x1102	0x7002	"emu10k1-gp"	"Creative Labs|SB Live! (joystick)"
+0x1102	0x8938	"es1371"	"Creative Labs|ES1371"
+0x1106	0x0926	"ne2k-pci"	"VIA Technologies|VT82C926 [Amazon]"
+0x1106	0x3043	"via-rhine"	"VIA Technologies|VT86C100A [Rhine 10/100]"
+0x1106	0x3058	"via82cxxx_audio"	"VT82C686 [Apollo Super AC97/Audio]"
+0x1106	0x3059	"via82cxxx_audio"	"VIA Technologies|VT8233 [AC97 Audio Controller]"
+0x127a	0x4310	"via82cxxx_audio"	"Rockwell Chameleon combo card [AC97 Audio Controller]"
+0x1106	0x3065	"via-rhine"	"VIA Technologies|VT82C100A [Rhine 10/100]"
+0x1106	0x3122	"Server:Xorg(vesa)"	"VIA Technologies|VT8623 [Apollo CLE266]"
+0x1106	0x6100	"via-rhine"	"VIA Technologies|VT85C100A [Rhine II]"
+0x1113	0x1211	"8139too"	"Accton|SMC2-1211TX"
+0x1113	0x1216	"tulip"	"Accton|Ethernet Adapter"
+0x1113	0x1217	"tulip"	"Accton|EN-1217 Ethernet Adapter"
+0x1118	0x153b	"bttv"	"Terratec|TV Value"
+0x1119	0x0000	"gdth"	"ICP Vortex|GDT 6000/6020/6050"
+0x1119	0x0001	"gdth"	"ICP Vortex|GDT 6000b/6010"
+0x1119	0x0002	"gdth"	"ICP Vortex|GDT 6110/6510"
+0x1119	0x0003	"gdth"	"ICP Vortex|GDT 6120/6520"
+0x1119	0x0004	"gdth"	"ICP Vortex|GDT 6530"
+0x1119	0x0005	"gdth"	"ICP Vortex|GDT 6550"
+0x1119	0x0006	"gdth"	"ICP Vortex|GDT 6x17"
+0x1119	0x0007	"gdth"	"ICP Vortex|GDT 6x27"
+0x1119	0x0008	"gdth"	"ICP Vortex|GDT 6537"
+0x1119	0x0009	"gdth"	"ICP Vortex|GDT 5557"
+0x1119	0x000a	"gdth"	"ICP Vortex|GDT 6x15"
+0x1119	0x000b	"gdth"	"ICP Vortex|GDT 6x25"
+0x1119	0x000c	"gdth"	"ICP Vortex|GDT 6535"
+0x1119	0x000d	"gdth"	"ICP Vortex|GDT 6555"
+0x1119	0x0100	"gdth"	"ICP Vortex|GDT 6117RP/6517RP"
+0x1119	0x0101	"gdth"	"ICP Vortex|GDT 6127RP/6527RP"
+0x1119	0x0102	"gdth"	"ICP Vortex|GDT 6537RP"
+0x1119	0x0103	"gdth"	"ICP Vortex|GDT 6557RP"
+0x1119	0x0104	"gdth"	"ICP Vortex|GDT 6111RP/6511RP"
+0x1119	0x0105	"gdth"	"ICP Vortex|GDT 6121RP/6521RP"
+0x1119	0x0110	"gdth"	"ICP Vortex|GDT 6117RP1/6517RP1"
+0x1119	0x0111	"gdth"	"ICP Vortex|GDT 6127RP1/6527RP1"
+0x1119	0x0112	"gdth"	"ICP Vortex|GDT 6537RP1"
+0x1119	0x0113	"gdth"	"ICP Vortex|GDT 6557RP1"
+0x1119	0x0114	"gdth"	"ICP Vortex|GDT 6111RP1/6511RP1"
+0x1119	0x0115	"gdth"	"ICP Vortex|GDT 6121RP1/6521RP1"
+0x1119	0x0118	"gdth"	"ICP Vortex|GDT 6x18RD"
+0x1119	0x0119	"gdth"	"ICP Vortex|GDT 6x28RD"
+0x1119	0x011A	"gdth"	"ICP Vortex|GDT 6x38RD"
+0x1119	0x011B	"gdth"	"ICP Vortex|GDT 6x58RD"
+0x1119	0x011a	"gdth"	"ICP Vortex|GDT 6x38RD"
+0x1119	0x011b	"gdth"	"ICP Vortex|GDT 6x58RD"
+0x1119	0x0120	"gdth"	"ICP Vortex|GDT 6117RP2/6517RP2"
+0x1119	0x0121	"gdth"	"ICP Vortex|GDT 6127RP2/6527RP2"
+0x1119	0x0122	"gdth"	"ICP Vortex|GDT 6537RP2"
+0x1119	0x0123	"gdth"	"ICP Vortex|GDT 6557RP2"
+0x1119	0x0124	"gdth"	"ICP Vortex|GDT 6111RP2/6511RP2"
+0x1119	0x0125	"gdth"	"ICP Vortex|GDT 6121RP2/6521RP2"
+0x1119	0x0138	"gdth"	"ICP Raid Controller|GDT 6118RS/6518RS/6618RS"
+0x1119	0x0139	"gdth"	"ICP Raid Controller|GDT 6128RS/6528RS/6628RS"
+0x1119	0x013a	"gdth"	"ICP Raid Controller|GDT 6538RS/6638RS"
+0x1119	0x013b	"gdth"	"ICP Raid Controller|GDT 6558RS/6658RS"
+0x1119	0x0166	"gdth"	"ICP Raid Controller|GDT 7113RN/7513RN/7613RN"
+0x1119	0x0167	"gdth"	"ICP Raid Controller|GDT 7123RN/7523RN/7623RN"
+0x1119	0x0168	"gdth"	"ICP Vortex|GDT 7x18RN"
+0x1119	0x0169	"gdth"	"ICP Vortex|GDT 7x28RN"
+0x1119	0x016A	"gdth"	"ICP Vortex|GDT 7x38RN"
+0x1119	0x016B	"gdth"	"ICP Vortex|GDT 7x58RN"
+0x1119	0x016a	"gdth"	"ICP Vortex|GDT 7x38RN"
+0x1119	0x016b	"gdth"	"ICP Vortex|GDT 7x58RN"
+0x1119	0x016c	"gdth"	"ICP Raid Controller|GDT 7533RN/7633RN"
+0x1119	0x016d	"gdth"	"ICP Raid Controller|GDT 7543RN/7643RN"
+0x1119	0x016e	"gdth"	"ICP Raid Controller|GDT 7553RN/7653RN"
+0x1119	0x016f	"gdth"	"ICP Raid Controller|GDT 7563RN/7663RN"
+0x1119	0x0210	"gdth"	"ICP Vortex|GDT 6x19RD"
+0x1119	0x0211	"gdth"	"ICP Vortex|GDT 6x29RD"
+0x1119	0x0260	"gdth"	"ICP Vortex|GDT 7x19RN"
+0x1119	0x0261	"gdth"	"ICP Vortex|GDT 7x29RN"
+0x1123	0x153b	"bttv"	"Terratec|TV/Radio+"
+0x1133	0xe001	"hisax"	"Eicon|DIVA 20PRO ISDN Adapter"
+0x1133	0xe002	"hisax"	"Eicon|DIVA 20 ISDN Adapter"
+0x1133	0xe003	"hisax"	"Eicon|DIVA 20PRO_U ISDN Adapter"
+0x1133	0xe004	"hisax"	"Eicon|DIVA 20_U ISDN Adapter"
+0x1133	0xe005	"hisax"	"Eicon|ISDN Controller"
+0x1142	0x6422	"Server:XF86_SVGA"	"ProVideo 6422"
+0x1142	0x643d	"Server:XF86_SVGA"	"ProMotion AT3D"
+0x1148	0x4200	"sktr"	"Syskonnect (Schneider & Koch)|Token ring adaptor"
+0x1148	0x4300	"sk98lin"	"Syskonnect (Schneider & Koch)|Gigabit Ethernet"
+0x11ab	0x4320	"sk98lin"	"Galileo Technology Ltd.|onboard Gigabit Ethernet network card"
+0x11ab	0x4362	"sk98lin"	"Marvel Yukon Network chipset"
+0x114f	0x0003	"dgrs"	"Digi International|RightSwitch SE-6"
+0x114f	0x0004	"epca"	"Digi International|AccelePort Xem"
+0x114f	0x0005	"epca"	"Digi International|AccelePort Xr"
+0x114f	0x0006	"epca"	"Digi International|AccelePort Xr,C/X"
+0x114f	0x0009	"epca"	"Digi International|AccelePort Xr/J"
+0x114f	0x0071	"hisax"	"Digi International|ISDN Adapter"
+0x115d	0x0003	"tulip_cb"	"Xircom|Cardbus Ethernet 10/100"
+0x1163	0x0001	"Server:Xorg(rendition)"	"Verite 1000"
+0x1163	0x2000	"Server:Xorg(rendition)"	"Verite V2000/V2100/V2200"
+0x1179	0x0001	"Server:Xorg(trident)"	"Toshiba|Toshiba-4010CDT"
+0x1179	0x0601	"Server:Xorg(trident)"	"601 (Trident Cyber 9525)"
+0x1179	0x0701	"toshoboe"	"Toshiba|FIR Port"
+0x1186	0x0100	"tulip"	"D-Link System Inc|DC21041"
+0x1186	0x1002	"sundance"	"D-Link Inc|DFE 550 TX"
+0x1186	0x1100	"tulip"	"D-Link Inc|Fast Ethernet Adapter"
+0x1186	0x1300	"8139too"	"D-Link Inc|DFE 538 TX"
+0x1191	0x8002	"atp870u"	"Artop Electronic Corp|AEC6710 SCSI-2 Host Adapter"
+0x1191	0x8010	"atp870u"	"Artop Electronic Corp|AEC6712UW SCSI"
+0x1191	0x8020	"atp870u"	"Artop Electronic Corp|AEC6712U SCSI"
+0x1191	0x8030	"atp870u"	"Artop Electronic Corp|AEC6712S SCSI"
+0x1191	0x8040	"atp870u"	"Artop Electronic Corp|AEC6712D SCSI"
+0x1191	0x8050	"atp870u"	"Artop Electronic Corp|AEC6712SUW SCSI"
+0x11ad	0x0002	"tulip"	"Lite-On|LNE100TX"
+0x11ad	0xc115	"tulip"	"Lite-On|LC82C115 PNIC-II"
+0x11de	0x6057	"buz"	"Zoran Corporation|ZR36057PQC Video cutting chipset"
+0x11de	0x6120	"hisax"	"Zoran Corporation|ZR36120 ISDN Adapter"
+0x11f6	0x0112	"hp100"	"Compex|ENet100VG4"
+0x11f6	0x1401	"ne2k-pci"	"Compex|ReadyLink 2000"
+0x11f6	0x2011	"winbond-840"	"Compex|RL100-ATX 10/100"
+0x11f6	0x2201	"ne2k-pci"	"Compex|ReadyLink 100TX (Winbond W89C840)"
+0x11f6	0x9881	"tulip"	"Compex|RL100TX"
+0x1200	0xbd11	"bttv"	"Pinnacle|PCTV Rave"
+0x120f	0x0001	"rrunner"	"Essential Communications|Roadrunner serial HIPPI"
+0x121a	0x0001	"Server:Xorg(glide)"	"Voodoo"
+0x121a	0x0002	"Server:Xorg(glide)"	"Voodoo 2"
+0x121a	0x0003	"Server:Xorg(tdfx)"	"Voodoo Banshee"
+0x121a	0x0004	"Server:Xorg(tdfx)"	"Voodoo Banshee [Velocity 100]"
+0x121a	0x0005	"Server:Xorg(tdfx)"	"Voodoo 3"
+0x121a	0x0009	"Server:Xorg(tdfx)"	"Voodoo 4/5"
+0x1244	0x0700	"b1pci"	"AVM Audiovisuelles|B1 ISDN Adapter"
+0x1256	0x4201	"pci2220i"	"Perceptive Solutions, Inc.|PCI-2220I"
+0x1256	0x4401	"pci2220i"	"Perceptive Solutions, Inc.|PCI-2240I"
+0x1256	0x5201	"pci2000"	"Perceptive Solutions, Inc.|PCI-2000"
+0x1259	0x2560	"eepro100"	"Allied Telesyn International|AT-2560 Fast Ethernet Adapter (i82557B)"
+0x125b	0x1400	"tulip"	"ASIX|AX88140"
+0x125d	0x1948	"maestro "	"Solo?"
+0x125d	0x1968	"maestro "	"ES1968 Maestro 2"
+0x125d	0x1969	"esssolo1"	"ESS Technology|ES1969 Solo-1 Audiodrive"
+0x125d	0x1978	"maestro"	"ES1978 Maestro 2E"
+0x125d	0x1988	"maestro3"	"ESS Technology|ES1988 Allegro-1"
+0x125d	0x1998	"maestro3"	"ESS Technology|ES1983S Maestro-3i PCI Audio Accelerator"
+0x125d	0x199a	"maestro3"	"ESS Technology|Maestro-3"
+0x1266	0x0001	"eepro100"	"Microdyne Corporation|NE10/100 Adapter (i82557B)"
+0x1267	0x1016	"hisax"	"S. A. Telecommunications|Dr. Neuhaus Niccy PCI ISDN Adapter"
+0x126f	0x0710	"Server:XF86_SVGA"	"SM710 LynxEM"
+0x126f	0x0712	"Server:Xorg(siliconmotion)"	"Silicon Motion, Inc.|SM712 LynxEM+ (rev a0)"
+0x126f	0x0720	"Server:Xorg(siliconmotion)"	"Silicon Motion, Inc.|SM720 Lynx3DM"
+0x126f	0x0810	"Server:XF86_SVGA"	"SM810 LynxE"
+0x126f	0x0811	"Server:XF86_SVGA"	"SM811 LynxE"
+0x126f	0x0820	"Server:XF86_SVGA"	"SM820 Lynx3D"
+0x126f	0x0910	"Server:XF86_SVGA"	"SM910"
+0x1274	0x1371	"es1371"	"ES1371 [AudioPCI-97]"
+0x1274	0x5000	"es1370"	"ES1370 [AudioPCI]"
+0x1274	0x5880	"es1371"	"5880 AudioPCI"
+0x1282	0x9100	"tulip"	"Davicom|DM9100"
+0x1282	0x9102	"dmfe"	"Davicom|Ethernet 100/10 MBit DM9102"
+0x1285	0x0100	"maestro"	"AGOGO sound chip (aka ESS Maestro 1)"
+0x12ae	0x0001	"acenic"	"Alteon Networks Inc.|AceNIC Gigabit Ethernet"
+0x12ae	0x0002	"acenic"	"Alteon Networks Inc.|AceNIC Gigabit Ethernet (Copper)"
+0x12d2	0x0008	"Server:Xorg(nv)"	"NV1"
+0x12d2	0x0009	"Server:Xorg(nv)"	"DAC64"
+0x12d2	0x0018	"Server:Xorg(nv)"	"Riva128"
+0x12d2	0x0019	"Server:Xorg(nv)"	"Riva128ZX"
+0x12d2	0x0020	"Server:Xorg(nv)"	"TNT"
+0x12d2	0x0028	"Server:Xorg(nv)"	"TNT2"
+0x12eb	0x0001	"au8820"	"Vortex 1"
+0x12eb	0x0002	"au8830"	"Vortex 2"
+0x1317	0x0981	"tulip"	"ADMtek|AN981 Comet"
+0x1317	0x0985	"tulip"	"Bridgecom, Inc|Linksys EtherFast 10/100"
+0x1318	0x0911	"hamachi"	"Packet Engines Inc.|PCI Ethernet Adapter"
+0x134a	0x0001	"dtc"	"DTC Technology Corp.|Domex 536"
+0x134a	0x0002	"dtc"	"DTC Technology Corp.|Domex DMX3194UP SCSI Adapter"
+0x1385	0x620a	"acenic"	"Netgear|GA620"
+0x1397	0x2bd0	"hisax"	"Cologne Chip Designs|ISDN network controller [HFC-PCI]"
+0x1397	0xb000	"hisax"	"Cologne Chip Designs|ISDN network controller [HFC-PCI]"
+0x1397	0xb006	"hisax"	"Cologne Chip Designs|ISDN network controller [HFC-PCI]"
+0x1397	0xb007	"hisax"	"Cologne Chip Designs|ISDN network controller [HFC-PCI]"
+0x1397	0xb008	"hisax"	"Cologne Chip Designs|ISDN network controller [HFC-PCI]"
+0x1397	0xb009	"hisax"	"Cologne Chip Designs|ISDN network controller [HFC-PCI]"
+0x1397	0xb00a	"hisax"	"Cologne Chip Designs|ISDN network controller [HFC-PCI]"
+0x1397	0xb00b	"hisax"	"Cologne Chip Designs|ISDN network controller [HFC-PCI]"
+0x1397	0xb00c	"hisax"	"Cologne Chip Designs|ISDN network controller [HFC-PCI]"
+0x1397	0xb100	"hisax"	"Cologne Chip Designs|ISDN network controller [HFC-PCI]"
+0x13c0	0x0010	"synclink"	"Microgate Corporation|SyncLink WAN Adapter"
+0x13c1	0x1000	"3w-xxxx"	"3ware Inc|3ware ATA-RAID"
+0x13eb	0x0070	"bttv"	"Hauppauge|WinTV"
+0x13f6	0x0100	"cmpci"	"CM8338A"
+0x13f6	0x0101	"cmpci"	"CM8338B"
+0x13f6	0x0111	"cmpci"	"CM8738"
+0x13f6	0x0112	"cmipci"	"C-Media Electronics Inc|CM8738"
+0x13f6	0x0211	"cmpci"	"C-Media Electronics Inc|CM8738"
+0x1400	0x1401	"epic100"	"Standard Microsystems Corp [SMC]|9432 TX"
+0x1461	0x0002	"bttv"	"Avermedia|TVCapture 98"
+0x14b9	0x0001	"aironet4500_card"	"AIRONET Wireless Communications|PC4800"
+0x1500	0x1360	"8139too"	"Delta Electronics|8139 10/100BaseTX"
+0x1571	0xa001	"com20020-pci"	"Contemporary Controls|CCSI PCI20-485 ARCnet"
+0x1571	0xa002	"com20020-pci"	"Contemporary Controls|CCSI PCI20-485D ARCnet"
+0x1571	0xa003	"com20020-pci"	"Contemporary Controls|CCSI PCI20-485X ARCnet"
+0x1571	0xa004	"com20020-pci"	"Contemporary Controls|CCSI PCI20-CXB ARCnet"
+0x1571	0xa005	"com20020-pci"	"Contemporary Controls|CCSI PCI20-CXS ARCnet"
+0x1571	0xa006	"com20020-pci"	"Contemporary Controls|CCSI PCI20-FOG-SMA ARCnet"
+0x1571	0xa007	"com20020-pci"	"Contemporary Controls|CCSI PCI20-FOG-ST ARCnet"
+0x1571	0xa008	"com20020-pci"	"Contemporary Controls|CCSI PCI20-TB5 ARCnet"
+0x1571	0xa009	"com20020-pci"	"Contemporary Controls|CCSI PCI20-5-485 5Mbit ARCnet"
+0x1571	0xa00a	"com20020-pci"	"Contemporary Controls|CCSI PCI20-5-485D 5Mbit ARCnet"
+0x1571	0xa00b	"com20020-pci"	"Contemporary Controls|CCSI PCI20-5-485X 5Mbit ARCnet"
+0x1571	0xa00c	"com20020-pci"	"Contemporary Controls|CCSI PCI20-5-FOG-ST 5Mbit ARCnet"
+0x1571	0xa00d	"com20020-pci"	"Contemporary Controls|CCSI PCI20-5-FOG-SMA 5Mbit ARCnet"
+0x1571	0xa201	"com20020-pci"	"Contemporary Controls|CCSI PCI22-485 10Mbit ARCnet"
+0x1571	0xa202	"com20020-pci"	"Contemporary Controls|CCSI PCI22-485D 10Mbit ARCnet"
+0x1571	0xa203	"com20020-pci"	"Contemporary Controls|CCSI PCI22-485X 10Mbit ARCnet"
+0x1571	0xa204	"com20020-pci"	"Contemporary Controls|CCSI PCI22-CHB 10Mbit ARCnet"
+0x1571	0xa205	"com20020-pci"	"Contemporary Controls|CCSI PCI22-FOG_ST 10Mbit ARCnet"
+0x1571	0xa206	"com20020-pci"	"Contemporary Controls|CCSI PCI22-THB 10Mbit ARCnet"
+0x15ad	0x0710	"Server:Xorg(vmware)"	"VMWare Inc|Virtual SVGA"
+0x15b0	0x2bd0	"hisax"	"Zoltrix|2BD0 ISDN Adapter"
+0x1850	0x1851	"bttv"	"Chronos|Video Shuttle II"
+0x1851	0x1851	"bttv"	"CyberMail AV"
+0x1852	0x1852	"bttv"	"Typhoon|TView TV/FM Tuner"
+0x1d44	0xa400	"eata"	"DPT|PM2x24/PM3224"
+0x1de1	0x0391	"dc395x_trm"	"Tekram|TRM-S1040"
+0x217d	0x6606	"bttv"	"Leadtek|WinFast TV 2000"
+0x2636	0x10b4	"bttv"	"STB|TV PCI FM, P/N 6000704"
+0x3000	0x144f	"bttv"	"???!TView 99 (CPH063)"
+0x3000	0x14ff	"bttv"	"???!TView 99 (CPH061)"
+0x3002	0x144f	"bttv"	"Askey|Magic TView"
+0x3002	0x14ff	"bttv"	"Phoebe|TV Master"
+0x3d3d	0x0001	"Server:Xorg(glint)"	"GLINT 300SX (ELSA GLoria-S)"
+0x3d3d	0x0002	"Server:Xorg(glint)"	"GLINT 500TX (ELSA GLoria-L)"
+0x3d3d	0x0003	"Server:Xorg(glint)"	"GLINT Delta (ELSA GLoria-S)"
+0x3d3d	0x0004	"Server:Xorg(glint)"	"Permedia (ELSA GLoria-S)"
+0x3d3d	0x0005	"Server:Xorg(glint)"	"Permedia (ELSA GLoria-S)"
+0x3d3d	0x0006	"Server:Xorg(glint)"	"GLINT MX (ELSA GLoria-S)"
+0x3d3d	0x0007	"Server:Xorg(glint)"	"3D Extreme (ELSA GLoria-S)"
+0x3d3d	0x0008	"Server:Xorg(glint)"	"GLINT Gamma G1 (ELSA GLoria-S)"
+0x3d3d	0x0009	"Server:Xorg(glint)"	"Permedia II 2D+3D"
+0x3d3d	0x000a	"Server:Xorg(glint)"	"GLINT R3 (ELSA Gloria-S)"
+0x3d3d	0x0100	"Server:Xorg(glint)"	"Permedia II 2D+3D"
+0x3d3d	0x0001	"Server:Xorg(glint)"	"GLINT 300SX (ELSA GLoria-S)"
+0x3d3d	0x0003	"Server:Xorg(glint)"	"GLINT Delta (ELSA GLoria-S)"
+0x3d3d	0xffff	"Server:Xorg(glint)"	"Glint VGA (ELSA Goria-S)"
+0x4005	0x2301	"Server:XF86_SVGA"	"ALG-2301"
+0x4005	0x2302	"Server:XF86_SVGA"	"ALG-2302"
+0x400a	0x15b0	"bttv"	"Zoltrix|Genie TV"
+0x4010	0x15b0	"bttv"	"Zoltrix|Genie TV / Radio"
+0x4020	0x10fc	"bttv"	"I-O Data Co.|GV-BCV3/PCI"
+0x4033	0x1360	"8139too"	"Addtron Technology|8139 10/100BaseTX"
+0x4050	0x10fc	"bttv"	"I-O Data Co. GV-BCV4/PCI"
+0x4500	0x0070	"bttv"	"Hauppauge WinTV/PVR"
+0x4a14	0x5000	"ne2k-pci"	"NetVin|NV5000SC"
+0x5301	0x0001	"Server:XF86_SVGA"	"ProMotion AT3D"
+0x5333	0x0551	"Server:XF86_S3"	"Plato/PX (system)"
+0x5333	0x5631	"Server:Xorg(s3virge)"	"ViRGE 86c325 [ViRGE]"
+0x5333	0x8801	"Server:XF86_S3"	"86c964 [Vision 964]"
+0x5333	0x8810	"Server:XF86_S3"	"86c764_0 [Trio 32 vers 0]"
+0x5333	0x8811	"Server:XF86_S3"	"86c764/765 [Trio32/64/64V+]"
+0x5333	0x8812	"Server:XF86_S3"	"86cM65 [Aurora64V+]"
+0x5333	0x8813	"Server:XF86_S3"	"86c764_3 [Trio 32/64 vers 3]"
+0x5333	0x8814	"Server:XF86_S3"	"86c767 [Trio 64UV+]"
+0x5333	0x8815	"Server:XF86_S3"	"86cM65 [Aurora 128] (Aurora64V+)"
+0x5333	0x883d	"Server:XF86_S3"	"86c988 [ViRGE/VX]"
+0x5333	0x8880	"Server:XF86_S3"	"86c868 [Vision 868 VRAM] vers 0"
+0x5333	0x8881	"Server:XF86_S3"	"86c868 [Vision 868 VRAM] vers 1"
+0x5333	0x8882	"Server:XF86_S3"	"86c868 [Vision 868 VRAM] vers 2"
+0x5333	0x8883	"Server:XF86_S3"	"86c868 [Vision 868 VRAM] vers 3"
+0x5333	0x88b0	"Server:XF86_S3"	"86c928 [Vision 928 VRAM] vers 0"
+0x5333	0x88b1	"Server:XF86_S3"	"86c928 [Vision 928 VRAM] vers 1"
+0x5333	0x88b2	"Server:XF86_S3"	"86c928 [Vision 928 VRAM] vers 2"
+0x5333	0x88b3	"Server:XF86_S3"	"86c928 [Vision 928 VRAM] vers 3"
+0x5333	0x88c0	"Server:XF86_S3"	"86c864 [Vision 864 DRAM] vers 0"
+0x5333	0x88c1	"Server:XF86_S3"	"86c864 [Vision 864 DRAM] vers 1"
+0x5333	0x88c2	"Server:XF86_S3"	"86c864 [Vision 864-P DRAM] vers 2"
+0x5333	0x88c3	"Server:XF86_S3"	"86c864 [Vision 864-P DRAM] vers 3"
+0x5333	0x88d0	"Server:XF86_S3"	"86c964 [Vision 964 VRAM] vers 0"
+0x5333	0x88d1	"Server:XF86_S3"	"86c964 [Vision 964 VRAM] vers 1"
+0x5333	0x88d2	"Server:XF86_S3"	"86c964 [Vision 964-P VRAM] vers 2"
+0x5333	0x88d3	"Server:XF86_S3"	"86c964 [Vision 964-P VRAM] vers 3"
+0x5333	0x88f0	"Server:XF86_S3"	"86c968 [Vision 968 VRAM] rev 0"
+0x5333	0x88f1	"Server:XF86_S3"	"86c968 [Vision 968 VRAM] rev 1"
+0x5333	0x88f2	"Server:XF86_S3"	"86c968 [Vision 968 VRAM] rev 2"
+0x5333	0x88f3	"Server:XF86_S3"	"86c968 [Vision 968 VRAM] rev 3"
+0x5333	0x8900	"Server:XF86_S3"	"86c755 [Trio 64V2/DX]"
+0x5333	0x8901	"Server:XF86_S3"	"Trio 64V2/DX or /GX"
+0x5333	0x8902	"Server:XF86_S3"	"Plato/PX"
+0x5333	0x8903	"Server:Xorg(s3virge)"	"Trio 3D business multimedia"
+0x5333	0x8904	"Server:Xorg(s3virge)"	"S3 ViRGE (rev. 01)"
+0x5333	0x8905	"Server:XF86_S3"	"Trio 64V+ family"
+0x5333	0x8906	"Server:XF86_S3"	"Trio 64V+ family"
+0x5333	0x8907	"Server:XF86_S3"	"Trio 64V+ family"
+0x5333	0x8908	"Server:XF86_S3"	"Trio 64V+ family"
+0x5333	0x8909	"Server:XF86_S3"	"Trio 64V+ family"
+0x5333	0x890a	"Server:XF86_S3"	"Trio 64V+ family"
+0x5333	0x890b	"Server:XF86_S3"	"Trio 64V+ family"
+0x5333	0x890c	"Server:XF86_S3"	"Trio 64V+ family"
+0x5333	0x890d	"Server:XF86_S3"	"Trio 64V+ family"
+0x5333	0x890e	"Server:XF86_S3"	"Trio 64V+ family"
+0x5333	0x890f	"Server:XF86_S3"	"Trio 64V+ family"
+0x5333	0x8a01	"Server:Xorg(s3virge)"	"ViRGE/DX or /GX"
+0x5333	0x8a10	"Server:Xorg(s3virge)"	"ViRGE/GX2"
+0x5333	0x8a13	"Server:Xorg(s3virge)"	"86c368 [Trio 3D/2X]"
+0x5333	0x8a20	"Server:XF86_SVGA"	"86c794 [Savage 3D]"
+0x5333	0x8a21	"Server:XF86_SVGA"	"86c795 [Savage 3D/MV]"
+0x5333	0x8a22	"Server:Xorg(savage)"	"Savage 4"
+0x5333	0x8a23	"Server:Xorg(savage)"	"Savage 4"
+0x5333	0x8a25	"Server:Xorg(savage)"	"ProSavage PM"
+0x5333	0x8a26	"Server:Xorg(savage)"	"ProSavage KM"
+0x5333	0x8c00	"Server:Xorg(s3virge)"	"ViRGE/M3"
+0x5333	0x8c01	"Server:Xorg(vesa)"	"ViRGE/MX"
+0x5333	0x8c02	"Server:Xorg(s3virge)"	"ViRGE/MX+"
+0x5333	0x8c03	"Server:Xorg(s3virge)"	"ViRGE/MX+MV"
+0x5333	0x8c10	"Server:Xorg(savage)"	"86C270-294|Savage/MX-/MV"
+0x5333	0x8c11	"Server:Xorg(savage)"	"86C270-294|Savage/MX"
+0x5333	0x8c12	"Server:Xorg(savage)"	"86C270-294|Savage/IX-/MV"
+0x5333	0x8c13	"Server:Xorg(savage)"	"86C270-294|Savage/IX"
+0x5333	0x9102	"Server:XF86_SVGA"	"86C410 Savage 2000"
+0x5333	0xca00	"sonicvibes"	"S3 Inc.|SonicVibes"
+0x6606	0x107d	"bttv"	"Leadtek WinFast TV 2000"
+0x6606	0x217d	"bttv"	"Leadtek|WinFast TV 2000"
+0x8086	0x0039	"tulip"	"Intel Corporation|21145"
+0x8086	0x1000	"e1000"	"Intel Corporation|82542 Gigabit Ethernet Adapter"
+0x8086	0x1001	"e1000"	"Intel Corporation|82543 Gigabit Ethernet Adapter"
+0x8086	0x1030	"e100"	"Intel Corporation|82559 InBusiness 10/100"
+0x8086	0x1132	"Server:Xorg(i810)"	"Intel Corporation|82815 CGC [Chipset Graphics Controller]"
+0x8086	0x1209	"e100"	"Intel Corporation|82559ER"
+0x8086	0x1227	"eepro100"	"Intel Corporation|82865 [Ether Express Pro 100]"
+0x8086	0x1228	"eepro100"	"Intel Corporation|82556 [Ether Express Pro 100 Smart]"
+0x8086	0x1229	"e100"	"Intel Corporation|82559 [Ethernet Pro 100]"
+0x8086	0x1960	"megaraid"	"Intel Corporation|80960RP [i960RP Microprocessor]"
+0x8086	0x2415	"i810_audio"	"Intel Corporation|82801AA AC97 Audio"
+0x8086	0x2418	"i810_rng"	"Intel Corporation|82801AA 810 Chipset Hub to PCI Bridge"
+0x8086	0x2425	"i810_audio"	"Intel Corporation|82801AB AC97 Audio"
+0x8086	0x2428	"i810_rng"	"Intel Corporation|82801AB 810 Chipset Hub to PCI Bridge"
+0x8086	0x2445	"i810_audio"	"Intel Corporation|82820 820 (Camino 2) AC97 Audio"
+0x8086	0x2449	"e100"	"Intel Corporation|EtherExpress PRO/100"
+0x8086	0x3092	"i2o_block"	"Intel Corporation|Integrated RAID"
+0x8086	0x5200	"e100"	"Intel Corporation|EtherExpress PRO/100"
+0x8086	0x5201	"e100"	"Intel Corporation|EtherExpress PRO/100"
+0x8086	0x3582	"Server:Xorg(fbdev)"	"Intel Corp. 82852/855GM Integrated Graphics Device (rev 02)"
+0x8086	0x7121	"Server:Xorg(i810)"	"82810 CGC [Chipset Graphics Controller] (i810)"
+0x8086	0x7123	"Server:Xorg(i810)"	"82810-DC100 CGC [Chipset Graphics Controller] (i810)"
+0x8086	0x7125	"Server:Xorg(i810)"	"82810E CGC [Chipset Graphics Controller] (i810)"
+0x8086	0x7195	"i810_audio"	"Intel Corporation|82440MX AC97 Audio Controller"
+0x8086	0x7800	"Server:Xorg(i740)"	"i740"
+0x8086	0x9621	"i2o_block"	"Intel Corporation|Integrated RAID"
+0x8086	0x9622	"i2o_block"	"Intel Corporation|Integrated RAID"
+0x8086	0x9641	"i2o_block"	"Intel Corporation|Integrated RAID"
+0x8086	0x96a1	"i2o_block"	"Intel Corporation|Integrated RAID"
+0x8e2e	0x3000	"ne2k-pci"	"KTI|ET32P2"
+0x9004	0x1078	"aic7xxx"	"Adaptec|AIC-7810"
+0x9004	0x2178	"aic7xxx"	"Adaptec|AIC-7821"
+0x9004	0x3860	"aic7xxx"	"Adaptec|AHA-2930CU"
+0x9004	0x5075	"aic7xxx"	"Adaptec|AIC-755x"
+0x9004	0x5078	"aic7xxx"	"Adaptec|AHA-7850"
+0x9004	0x5175	"aic7xxx"	"Adaptec|AIC-755x"
+0x9004	0x5178	"aic7xxx"	"Adaptec|AIC-7851"
+0x9004	0x5275	"aic7xxx"	"Adaptec|AIC-755x"
+0x9004	0x5278	"aic7xxx"	"Adaptec|AIC-7852"
+0x9004	0x5375	"aic7xxx"	"Adaptec|AIC-755x"
+0x9004	0x5378	"aic7xxx"	"Adaptec|AIC-7850"
+0x9004	0x5475	"aic7xxx"	"Adaptec|AIC-2930"
+0x9004	0x5478	"aic7xxx"	"Adaptec|AIC-7850"
+0x9004	0x5575	"aic7xxx"	"Adaptec|AVA-2930"
+0x9004	0x5578	"aic7xxx"	"Adaptec|AIC-7855"
+0x9004	0x5675	"aic7xxx"	"Adaptec|AIC-755x"
+0x9004	0x5678	"aic7xxx"	"Adaptec|AIC-7850"
+0x9004	0x5775	"aic7xxx"	"Adaptec|AIC-755x"
+0x9004	0x5778	"aic7xxx"	"Adaptec|AIC-7850"
+0x9004	0x5800	"aic7xxx"	"Adaptec|AIC-5800"
+0x9004	0x6038	"aic7xxx"	"Adaptec|AIC-3860"
+0x9004	0x6075	"aic7xxx"	"Adaptec|AIC-1480 / APA-1480"
+0x9004	0x6078	"aic7xxx"	"Adaptec|AIC-7860"
+0x9004	0x6178	"aic7xxx"	"Adaptec|AIC-7861"
+0x9004	0x6278	"aic7xxx"	"Adaptec|AIC-7860"
+0x9004	0x6378	"aic7xxx"	"Adaptec|AIC-7860"
+0x9004	0x6478	"aic7xxx"	"Adaptec|AIC-786"
+0x9004	0x6578	"aic7xxx"	"Adaptec|AIC-786x"
+0x9004	0x6678	"aic7xxx"	"Adaptec|AIC-786"
+0x9004	0x6778	"aic7xxx"	"Adaptec|AIC-786x"
+0x9004	0x6915	"starfire"	"Adaptec|ANA620xx/ANA69011A Fast Ethernet"
+0x9004	0x7078	"aic7xxx"	"Adaptec|AHA-294x / AIC-7870"
+0x9004	0x7178	"aic7xxx"	"Adaptec|AHA-294x / AIC-7871"
+0x9004	0x7278	"aic7xxx"	"Adaptec|AHA-3940 / AIC-7872"
+0x9004	0x7378	"aic7xxx"	"Adaptec|AHA-3985 / AIC-7873"
+0x9004	0x7478	"aic7xxx"	"Adaptec|AHA-2944 / AIC-7874"
+0x9004	0x7578	"aic7xxx"	"Adaptec|AHA-3944 / AHA-3944W / 7875"
+0x9004	0x7678	"aic7xxx"	"Adaptec|AHA-4944W/UW / 7876"
+0x9004	0x7778	"aic7xxx"	"Adaptec|AIC-787x"
+0x9004	0x7810	"aic7xxx"	"Adaptec|AIC-7810"
+0x9004	0x7815	"aic7xxx"	"Adaptec|AIC-7815 RAID+Memory Controller IC"
+0x9004	0x7850	"aic7xxx"	"Adaptec|AIC-7850"
+0x9004	0x7855	"aic7xxx"	"Adaptec|AHA-2930"
+0x9004	0x7860	"aic7xxx"	"Adaptec|AIC-7860"
+0x9004	0x7870	"aic7xxx"	"Adaptec|AIC-7870"
+0x9004	0x7871	"aic7xxx"	"Adaptec|AHA-2940"
+0x9004	0x7872	"aic7xxx"	"Adaptec|AHA-3940"
+0x9004	0x7873	"aic7xxx"	"Adaptec|AHA-3980"
+0x9004	0x7874	"aic7xxx"	"Adaptec|AHA-2944"
+0x9004	0x7880	"aic7xxx"	"Adaptec|AIC-7880P"
+0x9004	0x7890	"aic7xxx"	"Adaptec|AIC-7890"
+0x9004	0x7891	"aic7xxx"	"Adaptec|AIC-789x"
+0x9004	0x7892	"aic7xxx"	"Adaptec|AIC-789x"
+0x9004	0x7893	"aic7xxx"	"Adaptec|AIC-789x"
+0x9004	0x7894	"aic7xxx"	"Adaptec|AIC-789x"
+0x9004	0x7895	"aic7xxx"	"Adaptec|AHA-2940U/UW / AHA-39xx / AIC-7895"
+0x9004	0x7896	"aic7xxx"	"Adaptec|AIC-789x"
+0x9004	0x7897	"aic7xxx"	"Adaptec|AIC-789x"
+0x9004	0x8078	"aic7xxx"	"Adaptec|AIC-7880U"
+0x9004	0x8178	"aic7xxx"	"Adaptec|AIC-7881U"
+0x9004	0x8278	"aic7xxx"	"Adaptec|AHA-3940U/UW / AIC-7882U"
+0x9004	0x8378	"aic7xxx"	"Adaptec|AHA-3940U/UW / AIC-7883U"
+0x9004	0x8478	"aic7xxx"	"Adaptec|AHA-294x / AIC-7884U"
+0x9004	0x8578	"aic7xxx"	"Adaptec|AHA-3944U / AHA-3944UWD / 7885"
+0x9004	0x8678	"aic7xxx"	"Adaptec|AHA-4944UW / 7886"
+0x9004	0x8778	"aic7xxx"	"Adaptec|AIC-788x"
+0x9004	0x8878	"aic7xxx"	"Adaptec|7888"
+0x9004	0x8b78	"aic7xxx"	"Adaptec|ABA-1030"
+0x9004	0xec78	"aic7xxx"	"Adaptec|AHA-4944W/UW"
+0x9005	0x0010	"aic7xxx"	"Adaptec|AHA-2940U2/W"
+0x9005	0x0011	"aic7xxx"	"Adaptec|2930U2"
+0x9005	0x0013	"aic7xxx"	"Adaptec|78902"
+0x9005	0x001f	"aic7xxx"	"Adaptec|AHA-2940U2/W / 7890"
+0x9005	0x0020	"aic7xxx"	"Adaptec|AIC-7890"
+0x9005	0x002f	"aic7xxx"	"Adaptec|AIC-7890"
+0x9005	0x0030	"aic7xxx"	"Adaptec|AIC-7890"
+0x9005	0x003f	"aic7xxx"	"Adaptec|AIC-7890"
+0x9005	0x0050	"aic7xxx"	"Adaptec|3940U2"
+0x9005	0x0051	"aic7xxx"	"Adaptec|3950U2D"
+0x9005	0x0053	"aic7xxx"	"Adaptec|AIC-7896 SCSI Controller"
+0x9005	0x005f	"aic7xxx"	"Adaptec|7896"
+0x9005	0x0080	"aic7xxx"	"Adaptec|7892A"
+0x9005	0x0081	"aic7xxx"	"Adaptec|7892B"
+0x9005	0x0083	"aic7xxx"	"Adaptec|7892D"
+0x9005	0x008f	"aic7xxx"	"Adaptec|7892P"
+0x9005	0x00c0	"aic7xxx"	"Adaptec|7899A"
+0x9005	0x00c1	"aic7xxx"	"Adaptec|7899B"
+0x9005	0x00c3	"aic7xxx"	"Adaptec|7899D"
+0x9005	0x00cf	"aic7xxx"	"Adaptec|7899P"
+0xe159	0x0001	"hisax"	"Tiger Jet Network Inc.|Model 300 128k ISDN Adapter"
+0xedd8	0xa091	"Server:XF86_SVGA"	"1000PV [Stingray]"
+0xedd8	0xa099	"Server:XF86_SVGA"	"2000PV [Stingray]"
+0xedd8	0xa0a1	"Server:XF86_SVGA"	"2000MT"
+0xedd8	0xa0a9	"Server:XF86_SVGA"	"2000MI"
+0xff00	0x0070	"bttv"	"Osprey|Osprey-100"
+0xff01	0x0070	"bttv"	"Osprey|Osprey-200"
+0xfffe	0x0710	"Server:Xorg(vmware)"	"VMWare Inc|Virtual SVGA"
+# Extra
+0x102b	0x1000	"Server:Xorg(mga)"	"Productiva G100 4MB MGA G100 [Productiva]"
+0x102b	0x1001	"Server:Xorg(mga)"	"Productiva G100 4MB MGA G100 [Productiva] AGP"
+0x3d3d	0x1004	"Server:Xorg(glint)"	"Permedia (ELSA Goria-S)"
+0x3d3d	0x3d04	"Server:Xorg(glint)"	"Permedia (ELSA Goria-S)"
+# Extra
+0x1002	0x5159	"Server:Xorg(vesa)"	"ATI|Radeon QY"
+0x1002	0x5446	"Server:Xorg(vesa)"	"ATI|Rage 128 Ultra TF"
+0x1002	0x544c	"Server:Xorg(r128)"	"ATI|Rage 128 Ultra TL"
+0x1002	0x5452	"Server:Xorg(r128)"	"ATI|Rage 128 Ultra"
+0x15ad	0x0405	"Server:Xorg(vmware)"	"VMWare Inc|Virtual SVGA"
+0xffff	0x0710	"Server:Xorg(vmware)"	"VMWare Inc|Virtual SVGA"
+0x104a	0x0010	"Server:Xorg(pvr2fb)"	"SGS Thomson|Kyro series"
+0x10e0	0x9135	"Server:Xorg(imstt)"	"IMS|TwinTurbo 3D"
+0x3d3d	0x000c	"Server:XF86_3DLabs"	"3Dlabs|GLINT Permedia 4"
+0x3d3d	0x000d	"Server:XF86_3DLabs"	"3Dlabs|GLINT R4"
+0x3d3d	0x000e	"Server:XF86_3DLabs"	"3Dlabs|GLINT Gamma 2"
+0x8086	0x2485	"i810_audio"	"Intel Corporation|82440MX AC97 Audio Controller"
+0x1039	0x7012	"i810_audio"	"Intel Corporation|82440MX AC97 Audio Controller"
+0x1260	0x3873	"hostap_pci"	"Harris Semiconductor PCI|Prism 2.5 Wavelan chipset"
+0x1260	0x3890	"ignore"	"Proprietary Wavelan chipset (ndiswrapper required)"
+0x1737	0x3874	"orinoco_pci"	"Harris Semiconductor PCI|Prism 2.5 Wavelan chipset"
+0x14e4	0x4401	"b44"	"Broadcom Corporation|BCM4401 100Base-T"
+0x14e4	0x4402	"b44"	"Broadcom Corporation|BCM4402 Integrated 10/100BaseT"
+0x14e4	0x4402	"b44"	"Broadcom Corporation|BCM4402 Integrated 10/100BaseT"
+0x10de	0x01c3	"forcedeth"	"nForce Ethernet Controller"
+0x10de	0x0066	"forcedeth"	"nForce2 Ethernet Controller"
+0x10de	0x00d6	"forcedeth"	"nForce3 Ethernet Controller"
+0x8086	0x1043	"ipw2100"	"Intel Corp.|PRO/Wireless LAN 2100 3B Mini PCI Adapter"
+0x1013	0x6004	"cs46xx"	"Cirrus Logic|CS 4614/22/24 [CrystalClear SoundFusion Audio Accelerator]"
+0x1022	0x7445	"i810_audio"	"Advanced Micro Devices [AMD]|AMD-768 [Opus] Audio"
+0x1022	0x746d	"i810_audio"	"Advanced Micro Devices [AMD]|AMD-8111 AC97 Audio"
+0x10b9	0x5455	"ali5455"	"ALi Corporation|M5455 PCI AC-Link Controller Audio Device"
+0x10de	0x006a	"i810_audio"	"nVidia Corporation|nForce2 AC97 Audio Controler (MCP)"
+0x10de	0x00da	"i810_audio"	"nVidia Corporation|AC97 Audio Controller"
+0x10de	0x01b1	"i810_audio"	"nVidia Corporation|nForce Audio"
+0x10ee	0x3fc4	"rme96xx"	"Xilinx Corporation|RME Digi9652 (Hammerfall)"
+0x1102	0x0006	"emu10k1"	"Creative Labs|[SB Live! Value] EMU10k1X"
+0x125d	0x1968	"maestro"	"ESS Technology|ES1968 Maestro 2"
+0x1319	0x0801	"forte"	"Fortemedia, Inc|Xwave QS3000A [FM801]"
+0x8086	0x24c5	"i810_audio"	"Intel Corp.|82801DB AC'97 Audio Controller"
+0x1014	0x005c	"eepro100"	"IBM|i82557B 10/100 PCI Ethernet Adapter"
+0x10c3	0x1100	"eepro100"	"Samsung Semiconductors, Inc.|Smartether100 SC1100 LAN Adapter (i82557B)"
+0x1259	0x2560	"eepro100"	"Allied Telesyn International|AT-2560 Fast Ethernet Adapter (i82557B)"
+0x1266	0x0001	"eepro100"	"Microdyne Corporation|NE10/100 Adapter (i82557B)"
+0x1266	0x0001	"eepro100"	"Microdyne Corporation|NE10/100 Adapter (i82557B)"
+0x8086	0x1030	"e100"	"Intel Corporation|82559 InBusiness 10/100"
+0x8086	0x1209	"e100"	"Intel Corporation|82559ER"
+0x8086	0x1227	"eepro100"	"Intel Corporation|82865 [Ether Express Pro 100]"
+0x8086	0x1228	"eepro100"	"Intel Corporation|82556 [Ether Express Pro 100 Smart]"
+0x8086	0x1229	"e100"	"Intel Corporation|82559 [Ethernet Pro 100]"
+0x8086	0x2449	"e100"	"Intel Corporation|EtherExpress PRO/100"
+0x8086	0x5200	"eepro100"	"Intel Corporation|EtherExpress PRO/100"
+0x8086	0x5201	"eepro100"	"Intel Corporation|EtherExpress PRO/100"
+0x1103	0x0008	"hptraid"	"Highpoint Raid Controller"
+0x1244	0x0a00	"hisax_fcpcipnp"	"Fritz!PCI V1/V2 ISDN Card"
+0x1039	0x6330	"Card:SiS 6326"	"SiS 6326"
+0x14e4	0x1644	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1645	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1646	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1647	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1648	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x164d	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1653	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1654	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x165d	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x165e	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x16a6	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x16a7	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x16a8	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x16c6	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x16c7	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1696	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x169c	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x169d	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x170d	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x170e	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1649	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x166e	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1658	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1659	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1676	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x1677	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x167c	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x167d	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x167e	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x16f7	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x16fd	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x16fe	"tg3"	"Broadcom Tigon3 Ethernet"
+0x14e4	0x16dd	"tg3"	"Broadcom Tigon3 Ethernet"
+0x1148	0x4400	"tg3"	"Broadcom Tigon3 Ethernet"
+0x1148	0x4500	"tg3"	"Broadcom Tigon3 Ethernet"
+0x173b	0x03e8	"tg3"	"Broadcom Tigon3 Ethernet"
+0x173b	0x03e9	"tg3"	"Broadcom Tigon3 Ethernet"
+0x173b	0x03eb	"tg3"	"Broadcom Tigon3 Ethernet"
+0x173b	0x03ea	"tg3"	"Broadcom Tigon3 Ethernet"
+0x106b	0x1645	"tg3"	"Broadcom Tigon3 Ethernet"
+0x10b7	0x1700	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x10b7	0x80eb	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x1148	0x4300	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x1148	0x4320	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x1148	0x9000	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x1148	0x9e00	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x1186	0x4b00	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x1186	0x4b01	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x1186	0x4c00	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4320	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4340	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4341	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4342	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4343	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4344	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4345	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4346	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4347	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4350	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4351	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4360	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4361	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x4362	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x11ab	0x5005	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x1371	0x434e	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x1737	0x1032	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
+0x1737	0x1064	"sk98lin"	"SysKonnect SK-NET Gigabit Ethernet"
diff --git a/initrd/initrd-stuff/usr/share/hwdata/upgradelist b/initrd/initrd-stuff/usr/share/hwdata/upgradelist
deleted file mode 100644
index f84f2db2..00000000
--- a/initrd/initrd-stuff/usr/share/hwdata/upgradelist
+++ /dev/null
@@ -1,59 +0,0 @@
-# modulename	class	new module name(s)
-
-3c90x		NETWORK	3c59x
-bcm5700		NETWORK tg3
-rtl8139		NETWORK	8139too
-old_tulip	NETWORK	tulip
-sktr		NETWORK	tmspci
-tr		NETWORK	lanstreamer
-eepro100	NETWORK e100
-veth		NETWORK	iseries_veth
-
-aic7xxx_mod	SCSI	aic7xxx
-hpnraid 	SCSI	aacraid
-percraid	SCSI	aacraid
-qla2x00		SCSI	qla2200/qla2300/qla2322/qla6312
-qla2300		SCSI	qla2200/qal2300/qla2322/qla6312
-isp_mod		SCSI	qlogicisp
-ncr53c8xx	SCSI	sym53c8xx
-sym53c8xx_2	SCSI	sym53c8xx
-megaraid2	SCSI	megaraid_mbox
-megaraid	SCSI	megaraid_mbox
-dpt_i2o		SCSI	i2o_block
-
-via82cxxx	AUDIO	snd-via82xx
-via82cxxx_audio	AUDIO	snd-via82xx
-ymfsb		AUDIO	snd-ymfpci
-ymf_sb		AUDIO	snd-ymfpci
-ymfpci		AUDIO	snd-ymfpci
-nm256		AUDIO	snd-nm256
-nm256_audio	AUDIO	snd-nm256
-trident		AUDIO	snd-trident/snd-ali5451
-rme96xx		AUDIO	snd-rme96/snd-rme9652/snd-hdsp
-maestro3	AUDIO	snd-maestro3
-i810_audio	AUDIO	snd-intel8x0
-ali5455		AUDIO	snd-intel8x0
-forte		AUDIO	snd-fm801
-maestro		AUDIO	snd-es1968
-esssolo1	AUDIO	snd-es1938
-es1370		AUDIO	snd-ens1370
-es1371		AUDIO	snd-ens1371
-cs4281		AUDIO	snd-cs4281
-cmpci		AUDIO	snd-cmipci
-sonicvibes	AUDIO	snd-sonicvibes
-emu10k1		AUDIO	snd-emu10k1
-audigy		AUDIO	snd-emu10k1
-cs46xx		AUDIO	snd-cs46xx
-sscape		AUDIO	snd-sscape
-opl3sa2		AUDIO	snd-opl3sa2
-sb		AUDIO	snd-es18xx/snd-als100/snd-sbawe/snd-sb16/snd-es968
-cs4232		AUDIO	snd-cs4236/snd-cs4232
-ad1816		AUDIO	snd-ad1816a
-mad16		AUDIO	snd-opti93x/snd-opti92x-cs4231/snd-opt92x-ad1848
-gus		AUDIO	snd-interwave
-ad1848		AUDIO	snd-ad1848
-audio		AUDIO	snd-usb-audio
-
-usb-uhci	USB	uhci-hcd
-uhci		USB	uhci-hcd
-usb-ohci	USB	ohci-hcd
diff --git a/initrd/initrd-stuff/usr/share/hwdata/usb.ids b/initrd/initrd-stuff/usr/share/hwdata/usb.ids
index ceb782f2..ee7bcb9d 100644
--- a/initrd/initrd-stuff/usr/share/hwdata/usb.ids
+++ b/initrd/initrd-stuff/usr/share/hwdata/usb.ids
@@ -6,7 +6,7 @@
 #	The latest version can be obtained from
 #		http://www.linux-usb.org/usb.ids
 #
-# $Id: usb.ids,v 1.203 2005/04/08 15:45:59 vojtech Exp $
+# $Id: usb.ids,v 1.222 2005/11/18 21:08:02 vojtech Exp $
 #
 
 # Vendors, devices and interfaces. Please keep sorted.
@@ -29,7 +29,8 @@
 03ea  Data Broadcasting Corp.
 03eb  Atmel Corp.
 	2002  Mass Storage Device
-	3301  4-port Hub
+	2103  JTAG ICE mkII
+	3301  at43301 4-port Hub
 	3312  4-port Hub
 	5601  at76c510 Prism-II 802.11b Access Point
 	5603  Cisco 7920 WiFi IP Phone
@@ -85,7 +86,7 @@
 	0904  DeskJet 845c
 	1004  DeskJet 970c/970cse
 	1005  ScanJet 5400c
-	1016  Jornada 548 Pocket PC
+	1016  Jornada 548 / iPAQ HW6515 Pocket PC 
 	1104  DeskJet 959c
 	1105  ScanJet 5470c
 	1116  Jornada 568 Pocket PC
@@ -97,7 +98,9 @@
 	1504  DeskJet 920c
 	1604  DeskJet 940c
 	1904  DeskJet 3820
+	1c17  Color LaserJet 2550l
 	1e11  PSC-950
+	2002  Hub
 	2004  DeskJet 640c
 	2005  ScanJet 3570c
 	2104  DeskJet 630c
@@ -113,7 +116,7 @@
 	3504  DeskJet 6127c
 	3c02  PhotoSmart 7350
 	3d11  OfficeJet 4215
-	3f11  PSC-1315
+	3f11  PSC-1315/PSC-1317
 	4002  PhotoSmart 720 / PhotoSmart 935 (storage)
 	4102  PhotoSmart 618
 	4202  PhotoSmart 812
@@ -158,9 +161,11 @@
 	1001  Mustek BearPaw 2400 Scanner
 0401  National Registry, Inc.
 0402  ALi Corp.
+	5462  M5462 IDE Controller
 	5603  USB 2.0 Q-tec Webcam 300
 	5621  USB 2.0 Storage Device
 	5632  USB 2.0 Host-to-Host Link
+	5637  M5637 IDE Controller
 0403  Future Technology Devices International, Ltd
 	0000  H4SMK 7 Port Hub
 	6001  8-bit FIFO
@@ -169,8 +174,10 @@
 	8370  7 Port Hub
 	8371  PS/2 Keyboard And Mouse
 	8372  FT8U100AX Serial Port
+	ea90  Eclo 1-Wire Adapter
 	f208  Papenmeier Braille-Display
 	fd48  ShipModul MiniPlex-4xUSB NMEA Multiplexer
+	ff08  ToolHouse LoopBack Adapter
 0404  NCR Corp.
 	0310 K590 Printer, Self-Service
 	0311 7167 Printer, Receipt/Slip
@@ -196,8 +203,9 @@
 	0058  HighSpeed Hub
 	0059  HighSpeed Hub
 	006a  Conceptronic USB Harddisk Box
+	011d  e228 Mobile Phone
 	55aa  Hub
-	55ab  Hub [iMac kbd]
+	55ab  Hub [iMac/iTouch kbd]
 	efbe  P!cty 900 [HP DJ]
 	f0be  P!cty 920 [HP DJ 812c]
 040a  Kodak Co.
@@ -237,6 +245,9 @@
 	0574  CX6200
 	0575  DX6490
 	0576  DX4530
+	057c  CX7530
+	057f  DX7590
+	5010  Wireless Adapter
 040b  Weltrend Semiconductor
 	6510  Weltrend Bar Code Reader
 	6520  XBOX Xploder
@@ -266,19 +277,20 @@
 0417  Symbios Logic
 0418  AST Research
 0419  Samsung Info. Systems America, Inc.
+	0001  IrDA Remote Controller
 	3001  Xerox P1202 Laser Printer
 	8002  SyncMaster 757DFX HID Device
 041a  Phoenix Technologies, Ltd
 041b  d'TV
 041d  S3, Inc.
 041e  Creative Technology, Ltd
-	1002  Nomad II MP3 Player
+	1002  Nomad II
 	1003  Blaster GamePad Cobra
 	1050  GamePad Cobra
 	3010  SoundBlaster MP3+
 	3020  SoundBlaster Audigy 2 NX
 	4003  VideoBlaster WebCam Go Plus [W9967CF]
-	4004  Nomad II MG MP3 Player
+	4004  Nomad II MG
 	4005  WebCam Blaster Go ES
 	400a  PC-Cam 300
 	400b  PC-Cam 600
@@ -290,22 +302,35 @@
 	4017  WebCam Mobile
 	4018  WebCam Vista
 	401c  WebCam NX [PD1110]
+	401d  WebCam NX Ultra
+	401e  WebCam NX Pro
 	401f  Webcam Notebook
-	4100  Nomad Jukebox 2 MP3 player
-	4101  Nomad Jukebox 3 MP3 player  
-	4106  Nomad MuVo MP3 Player
-	4108  Nomad Jukebox Zen MP3 player
-	4109  Nomad Jukebox Zen NX MP3 player
-	410b  Nomad Jukebox Zen USB 2.0 MP3 player
-	410c  Nomad MuVo NX MP3 Player
-	4110  Nomad Jukebox Zen Xtra MP3 player
+	4036  Webcam Live!/Live! Pro
+	403a  WebCam NX Pro 2
+	403c  WebCam Live! Ultra
+	403d  WebCam Notebook Ultra
+	4100  Nomad Jukebox 2
+	4101  Nomad Jukebox 3
+	4106  Nomad MuVo
+	4108  Nomad Jukebox Zen
+	4109  Nomad Jukebox Zen NX
+	410b  Nomad Jukebox Zen USB 2.0
+	410c  Nomad MuVo NX
+	4110  Nomad Jukebox Zen Xtra
 	4111  Dell Digital Jukebox
-	4116  MuVo^2 MP3 Player
+	4116  MuVo^2
 	4117  Nomad MuVo TX
-	411b  Nomad Jukebox Zen Touch MP3 player
-	411e  Nomad Jukebox Zen Micro MP3 player
+	411b  Zen Touch
+	411d  Zen
+	411e  Zen Micro
 	4123  Zen Portable Media Center
-	412b  MuVo N200 MP3 player with FM radio
+	4126  Dell DJ (2nd gen)
+	4127  Dell DJ
+	412b  MuVo N200 with FM radio
+	4134  Zen Neeon
+	4136  Zen Sleek
+	4139  Zen Nano Plus
+	413c  Zen MicroPhoto
 041f  LCS Telegraphics
 0420  Chips and Technologies
 0421  Nokia Mobile Phones
@@ -315,6 +340,9 @@
 	040f  6230 GSM Phone
 	0410  6630 Imaging Smartphone
 	0415  9300 GSM Smartphone
+	041a  9500 GSM Communicator (RNDIS)
+	041b  9300 GSM Smartphone (RNDIS)
+	0429  6230i Camera Phone
 	0800  Connectivity Cable DKU-5
 0422  ADI Systems, Inc.
 0423  Computer Access Technology Corp.
@@ -326,6 +354,7 @@
 	20fc  6-in-1 Card Reader
 	223a  8-in-1 Card Reader
 0425  Motorola Semiconductors HK, Ltd
+	0101  G-Tech Wireless Mouse & Keyboard
 0426  Integrated Device Technology, Inc.
 0427  Motorola Electronics Taiwan, Ltd
 0428  Advanced Gravis Computer Tech, Ltd
@@ -404,6 +433,7 @@
 	2046  TUSB2046 Hub
 	2077  TUSB2077 Hub
 	3410  TUSB3410 Microcontroller
+	5409  Frontier Labs NEX IA+ Digital Audio Player
 	6000  AU5 ADSL Modem (pre-reenum)
 	6001  AU5 ADSL Modem
 	e001  GraphLink
@@ -417,12 +447,15 @@
 0455  Telematics International, Inc.
 0456  Analog Devices, Inc.
 0457  Silicon Integrated Systems Corp.
+	0150  Super Talent 1GB Flash Drive
+	0151  Super Flash 1GB Flash Drive
 0458  KYE Systems Corp. (Mouse Systems)
 	0001  Mouse
 	0002  Genius NetMouse Pro
 	0003  Genius NetScroll+
 	000e  VideoCAM Web
 	001a  Genius WebScroll+
+	004c  Slimstar Pro Keyboard
 	0100  EasyPen Tablet
 	0101  CueCat
 	1003  Genius VideoCam
@@ -436,6 +469,7 @@
 	2013  ColorPage-HR7 Scanner
 	2015  ColorPage-HR7LE Scanner
 	2016  ColorPage-HR6X Scanner
+	301d  Genius MaxFire MiniPad
 	7004  VideoCAM Express
 	7007  VideoCAM Web
 	7012  WebCAM USB2.0
@@ -443,6 +477,7 @@
 045a  SONICblue, Inc.
 	0b4a  SupraMax 2890 56K Modem [Lucent Atlas]
 	0b68  SupraMax 56K Modem
+	5210  Rio Karma Music Player
 	5220  Rio Nitrus MP3 Player
 045b  Hitachi, Ltd
 045d  Nortel Networks, Ltd
@@ -476,8 +511,11 @@
 	006e  MN510 802.11b Adapter
 	007d  Notebook Optical Mouse
 	007e  Wireless Transceiver for Bluetooth
+	0083  Basic Optical Mouse
 	008a  Wireless Keyboard and Mouse
 	008c  Wireless Intellimouse Explorer 2.0
+	00b9  Wireless Optical Mouse 3.0
+	00bd  Fingerprint Reader
 	0284  Xbox DVD Playback Kit
 	0288  Xbox Controller S Hub
 	0289  Xbox Controller S
@@ -522,6 +560,7 @@
 	0001  My3000 Keyboard
 	0003  My3000 Hub
 	0005  XX33 SmartCard Reader Keyboard
+	0023  Cymotion Master Linux Keyboard
 046b  American Megatrends, Inc.
 046c  Toshiba Corp., Digital Media Equipment
 046d  Logitech, Inc.
@@ -535,34 +574,49 @@
 	0840  QuickCam Express
 	0850  QuickCam Web
 	0870  QuickCam Express
+	0890  QuickCam Traveler
 	08a0  QuickCam IM
+	08a2  Labtec WebCam Pro
 	08b0  QuickCam 3000 Pro [pwc]
+	08b1  QuickCam Notebook Pro
 	08b2  QuickCam Pro 4000
 	08b3  QuickCam Zoom
 	08b4  QuickCam Zoom
+	08f0  QuickCam Messenger
 	0900  ClickSmart 310
 	0901  ClickSmart 510
+	0903  ClickSmart 820
+	0905  ClickSmart 820
+	0920  QuickCam Express
 	0921  Labtec WebCam
+	0928  Quickcam Express
+	092a  QuickCam for Notebooks
 	0950  Pocket Camera
+	0960  ClickSmart 420
+	0970  Pocket750
 	c000  N43 [Pilot Mouse]
 	c001  N48/M-BB48 [FirstMouse Plus]
 	c002  M-BA47 [MouseMan Plus]
 	c004  WingMan Gaming Mouse
 	c00b  MouseMan Wheel
 	c00c  Optical Wheel Mouse
-	c00e  Optical Mouse
+	c00e  M-BJ69 Optical Wheel Mouse
 	c012  Optical Mouse
-	c016  Optical Mouse
+	c016  M-UV69a Optical Wheel Mouse
 	c01b  MX310 Optical Mouse
+	c01e  MX518 Optical Mouse
 	c025  MX500 Optical Mouse
 	c030  iFeel Mouse
 	c032  MouseMan iFeel
+	c03e  Premium Optical Wheel Mouse
 	c202  WingMan Formula
 	c207  WingMan Extreme Digital 3D
 	c208  WingMan Gamepad Extreme
 	c209  WingMan Gamepad
 	c20a  WingMan RumblePad
 	c20c  WingMan Precision
+	c211  iTouch Cordless Reciever
+	c216  Dual Action Gamepad
 	c281  WingMan Force
 	c283  WingMan Force 3D
 	c285  WingMan Strike Force 3D
@@ -582,6 +636,7 @@
 	c504  Cordless Mouse+Keyboard Receiver
 	c505  Cordless Mouse+Keyboard Receiver
 	c506  MX-700 Cordless Mouse Receiver
+	c50b  Cordless Desktop Optical
 	c50e  MX-1000 Cordless Mouse Receiver
 	d001  QuickCam Pro
 046e  Behavior Tech. Computer Corp.
@@ -630,6 +685,7 @@
 	1003  Orbit TrackBall
 	1005  TurboBall
 	1009  Orbit TrackBall for Mac
+	101f  PocketMouse Pro
 	2010  Wireless Presentation Remote
 	4005  Gravis Eliminator GamePad Pro
 	4006  Gravis Eliminator AfterShock
@@ -647,6 +703,7 @@
 0483  SGS Thomson Microelectronics
 	1307  Cytronix 6in1 card reader
 	163d  Cool Icam Digi-MP3
+	2016  Fingerprint Reader
 	2017  Biometric Smart Card Reader
 	7554  56k SoftModem
 0484  Specialix
@@ -683,6 +740,7 @@
 	001a  S4 100 Scanner
 	0021  S200 Scanner
 	0033  801.11b Adapter [orinoco]
+	0051  KU-0133 Easy Access Interner Keyboard
 	505a  SA-11x0 based Linux Device, or Itsy (experimental)
 	8511  iPAQ Networking 10/100 Ethernet [pegasus2]
 04a0  Digital Equipment Corp.
@@ -706,6 +764,9 @@
 	20fc  Benq 5000
 	20fe  SW2 5300U
 	3003  Benq WebCam
+	3008  Benq 1500
+	300a  Benq 3410
+	300c  Benq 1016
 	9213  Kbd Hub
 04a6  Nokia Display Products
 04a7  Visioneer
@@ -730,6 +791,7 @@
 	1072  I850 Printer
 	1073  I550 Printer
 	1074  S330 Printer
+	1094  PIXMA iP3000x Printer
 	2201  CanoScan FB320U
 	2202  CanoScan FB620U
 	2204  CanoScan FB630U
@@ -737,11 +799,18 @@
 	2206  CanoScan N650U/N656U
 	2207  CanoScan 1220U
 	2208  CanoScan D660U
+	220a  CanoScan D2400UF
 	220b  CanoScan D646U
 	220c  CanoScan D1250U2
 	220d  CanoScan N670U/N676U/LiDE 20
 	220e  CanoScan N1240U/LiDE 30
+	220f  CanoScan 8000F
+	2210  CanoScan 9900F
+	2212  CanoScan 5000F
 	2213  LiDE 50/LiDE 35
+	2215  CanoScan 3000/3000F/3000ex
+	2216  CanoScan 3200F
+	2217  CanoScan 5200F
 	221e  CanoScan 8400F
 	2611  SmartBase MPC400
 	262b  LaserShot LBP-1120 Printer
@@ -798,12 +867,15 @@
 	309b  Digital IXUS (ptp)
 	309c  PowerShot S1 IS
 	30b4  PowerShot S500
+	30b5  PowerShot A75
 	30b9  Powershot A85
 	30ba  PowerShot S410 Digital Elph
 	30bb  PowerShot A95
 	30bf  Digital IXUS 40
 	30eb  EOS 20D
 	30ec  EOS 20D (ptp)
+	30ee  EOS 350D
+	30ef  EOS 350D (ptp)
 04aa  DaeWoo Telecom, Ltd
 04ab  Chromatic Research
 04ac  Micro Audiometrics Corp.
@@ -831,6 +903,8 @@
 	0119  Coolpix 5400 (ptp)
 	011d  Coolpix 3700 (ptp)
 	012c  Coolpix 4100 (storage)
+	0136  Coolpix 7900 (storage)
+	0137  Coolpix 7900 (ptp)
 	0202  Coolpix SQ (ptp)
 	0205  Coolpix 5200 (storage)
 	0206  Coolpix 5200 (ptp)
@@ -841,9 +915,12 @@
 04b1  Pan International
 04b3  IBM Corp.
 	3004  Media Access Pro Keyboard
+	3016  UltraNav Keyboard Hub
+	3018  UltraNav Keyboard
 	3100  NetVista Mouse
 	3103  ScrollPoint Pro Mouse
 	3107  ThinkPad 800dpi Optical Travel Mouse
+	3108  800dpi Optical Mouse w/ Scroll Point
 	3109  Optical ScrollPoint Pro Mouse
 	310b  Red Wheel Mouse
 	4427  Portable CD ROM
@@ -862,6 +939,7 @@
 	5500  HID->COM RS232 Adapter
 	6560  CY7C65640 USB-2.0 "TetraHub"
 	6830  USB-2.0 IDE Adapter
+	7417  Wireless PC Lock
 	8613  CY7C68013 EZ-USB FX2 USB 2.0 Development Kit
 	d5d5  CY7C63x0x Zoltrix Z-Boxer GamePad
 	f000  CY30700 Licorice evaluation board
@@ -952,6 +1030,8 @@
 	012c  FinePix S7000 Zoom (Disk mode)
 	0130  Finepix S5000 Camera (Disk mode)
 	0131  Finepix S5000 Camera (PC-Cam mode)
+	0177  Finepix F10 Camera (Disk mode)
+	0179  Finepix F10 Camera (PTP mode)
 04cc  Philips Semiconductors
 	1122  Hub
 	1521  USB 2.0 Hub
@@ -987,7 +1067,7 @@
 	8006  Zaurus SL-B500/SL-5600 PDA
 	8007  Zaurus C-700 PDA
 	9014  IM-DR80 Portable NetMD Player
-	9031  Zaurus C-750/C-760/SL-C3000 PDA
+	9031  Zaurus C-750/C-760/C-860/SL-C3000 PDA
 	9032  Zaurus SL-6000
 	9050  Zaurus C-860 PDA
 04de  MindShare, Inc.
@@ -1007,6 +1087,7 @@
 	0007  Hifd
 	0101  eUSB ATA Bridge
 	0325  eUSB ORCA Quad Reader
+	0500  Veridicom 5thSense Fingerprint Sensor and eUSB SmartCard
 	1010  USBAT-2 CompactFlash Card Reader
 	5111  SCR331-DI SmartCard Reader
 	5113  SCR333 SmartCard Reader
@@ -1017,9 +1098,12 @@
 04e7  Elo TouchSystems
 	0001  TouchScreen
 04e8  Samsung Electronics Co., Ltd
+	0110  Connect3D Flash Drive
 	0111  Connect3D Flash Drive
 	1003  MP3 Player and Recorder
 	300c  ML-1210 Printer
+	324c  ML-1740 Printer
+	3260  CLP-510 Color Laser Printer
 	5a03  Yepp MP3 Player
 	6601  Z100 Mobile Phone
 04e9  PC-Tel, Inc.
@@ -1039,6 +1123,7 @@
 	0002  NT68P81 Keyboard
 	0110  KU-2971 Keyboard
 	0112  KU-8933 Keyboard with PS/2 Mouse port
+	0116  KU-2971 German Keyboard
 04f3  Elan Microelectronics Corp.
 04f4  Harting Elektronik, Inc.
 04f5  Fujitsu-ICL Systems, Inc.
@@ -1060,8 +1145,10 @@
 04fb  Biostar Microtech International Corp.
 04fc  Sunplus Technology Co., Ltd
 	0003  CM1092 Optical Scroller Mouse
+	0561  Flexcam 100
 	504a  SPCA504a Digital Camera
 	504b  Aiptek, 1.3 mega PockerCam
+	7333  Finet Technology Palmpix DC-85
 04fd  Soliton Systems, K.K.
 04fe  PFU, Ltd
 04ff  E-CMOS Corp.
@@ -1075,11 +1162,13 @@
 	00a0  3CREB96 Bluetooth Adapter
 	03e8  3C19250 Ethernet [klsi]
 	0a11  3CRWE254G72 802.11g Adapter
+	00df  3Com Home Connect lite
 	4601  3C460B 10/100 Ethernet Adapter
 	f002  3CP4218 ADSL Modem (pre-init)
 	f003  3CP4218 ADSL Modem
 	f100  3CP4218 ADSL Modem (pre-init)
 0507  Hosiden Corp.
+	0011  Konami ParaParaParadise Controller
 0508  Clarion Co., Ltd
 0509  Aztech Systems, Ltd
 050a  Cinch Connectors
@@ -1087,14 +1176,17 @@
 050c  InnoMedia, Inc.
 050d  Belkin Components
 	0103  F5U103 Serial Adapter [etek]
+	0108  F1DE108B KVM
 	0109  F5U109/F5U409 PDA Adapter
 	0115  SCSI Adapter
 	0121  F5D5050 100Mbps Ethernet
 	0208  USBView II Video Adapter [nt1004]
 	0224  F5U224 USB 2.0 4-Port Hub
 	0234  F5U234 USB 2.0 4-Port Hub
+	0803  Nostromo 1745 GamePad
 	0805  Nostromo N50 GamePad
 	1203  F5U120-PC Serial Port
+	7050  F5D7050 ver 1000 WiFi
 050e  Neon Technology, Inc.
 050f  KC Technology, Inc.
 	0003  KC82C160S Hub
@@ -1132,6 +1224,7 @@
 	a4a4  Linux-USB user-mode bulk source/sink
 	a4a5  Linux-USB File Storage Gadget
 	a4a6  Linux-USB Serial Gadget
+	a4a7  Linux-USB Serial Gadget (CDC ACM mode)
 0526  Temic MHS S.A.
 0527  ALTRA
 0528  ATI Technologies, Inc.
@@ -1216,13 +1309,20 @@
 	008b  Micro Vault 64M Mass Storage
 	0099  Clie NR70 PDA Mass Storage
 	009a  Clie NR70 PDA Serial
+	00c0  Handycam DCR-30
 	00c8  MZ-N710 Minidisc Walkman
+	00ca  MZ-DN430 Minidisc Walkman
+	00cb  MSAC-US20 Memory Stick Reader
 	0105  Micro Vault Hub
 	0107  VCC-U01 Visual Communication Camera
 	0144  Clie PEG-TH55 PDA
+	014c  Aiwa AM-NX9 Net MD Music Recorder MDLP
 	014d  Memory Stick Reader/Writer
 	0169  Clie PEG-TJ35 PDA Serial
 	016a  Clie PEG-TJ35 PDA Mass Storage
+	01c3  NW-E55 Network Walkman
+	01d0  DVD+RW External Drive DRU-700A
+	023b  DVD+RW External Drive DRU-800UL
 054d  Try Corp.
 054e  Proside Corp.
 054f  WYSE Technology Taiwan
@@ -1280,8 +1380,12 @@
 	b500  MDC 3000 Camera
 	c200  gSmart 300
 	c220  gSmart mini
+	c360  Mustek DV 4000
 	c420  gSmart mini 2
+	c440  Mustek DV 3000
 	c520  gSmart mini 3
+	c530  Mustek Gsmart LCD 2
+	c650  Mustek MDC5500Z
 	d001  WCam 300
 0560  Interface Corp.
 0561  Oasis Design, Inc.
@@ -1308,6 +1412,7 @@
 	0023  Intuos 12x12
 	0024  Intuos 12x18
 	0031  PL500
+	0042  Intuos 2 6x8
 	0043  Intuos 2
 056b  Decicon, Inc.
 056c  eTEK Labs
@@ -1322,20 +1427,26 @@
 056f  Korea Data Systems Co., Ltd
 0570  Epson America
 0571  Interex, Inc.
+	0002  echoFX InterView Lite
 0572  Conexant Systems (Rockwell), Inc.
 	0001  Ezcam II WebCam
 	0002  Ezcam II WebCam
 	0040  Wondereye CP-115 WebCam
 	1232  V.90 modem
 	cafe  AccessRunner ADSL Modem
-	cb00  E-Tech ADSL USB Modem v2
+	cb00  E-Tech ADSL Modem v2
+	cb01  GeekADSL Promax Q31 ADSL Modem
 0573  Zoran Co. Personal Media Division (Nogatech)
 	0003  USBGear USBG-V1
 	0400  D-Link V100
 	2000  X10 va10a Wireless Camera
 	2101  Zoran Co. PMD (Nogatech) AV-grabber Manhattan
+	2d00  Osprey 50
+	2d01  Hauppauge USB-Live Model 600
 	4100  USB-TV FM (NTSC)
+	4110  PNY USB-TV (NTSC) FM
 	4450  PixelView PlayTv-USB PRO (PAL) FM
+	4550  ZTV ZT-721 2.4GHz USB A/V Receiver
 	4d00  Hauppauge WinTV-USB USA
 	4d01  Hauppauge WinTV-USB
 	4d02  Hauppauge WinTV-USB UK
@@ -1347,14 +1458,18 @@
 	4d21  Hauppauge WinTV-USB II (PAL)
 	4d22  Hauppauge WinTV-USB II (PAL) Model 566
 	4d23  Hauppauge WinTV-USB France 4D23
+	4d25  Hauppauge WinTV-USB Model 40209 rev B234
 	4d26  Hauppauge WinTV-USB Model 40209 rev B243
-	4d28  Hauppauge WinTv-USB Model 40204 rev B283
+	4d27  Hauppauge WinTV-USB Model 40204 Rev B281
+	4d28  Hauppauge WinTV-USB Model 40204 rev B283
+	4d29  Hauppauge WinTV-USB Model 40205 rev B298
 	4d2a  Hauppague WinTV-USB Model 602 Rev B285
 	4d2b  Hauppague WinTV-USB Model 602 Rev B282
-	4d30  Hauppauge WinTV-USB with FM USA radio Model 602
+	4d30  Hauppauge WinTV-USB FM Model 40211 Rev B123
 	4d31  Hauppauge WinTV-USB III (PAL) with FM radio Model 568
 	4d32  Hauppauge WinTV-USB III (PAL) FM Model 573
 	4d35  Hauppauge WinTV-USB III (PAL) FM Model 597
+	4d37  Hauppauge WinTV-USB Model 40219 rev E189
 0574  City University of Hong Kong
 0575  Philips Creative Display Solutions
 0576  BAFO/Quality Computer Accessories
@@ -1372,6 +1487,7 @@
 057c  AVM GmbH
 	2800  ISDN-Connector TA
 	3800  BlueFRITZ! Bluetooth Stick
+	3d00  Fritz!Box
 057d  Shark Multimedia, Inc.
 057e  Nintendo Co., Ltd
 057f  QuickShot, Ltd
@@ -1381,7 +1497,7 @@
 	0002  MPU64 Midi Interface
 	0003  Sound Canvas SC-8850
 	0005  Edirol UM-2 MIDI Adapter
-	0011  Edirol UA-5 Sound Capture 
+	0011  Edirol UA-5 Sound Capture
 	002d  VX-2020 Synthesizer
 0583  Padix Co., Ltd (Rockfire)
 	2030  RM-203 USB Nest [mode 1]
@@ -1407,6 +1523,7 @@
 058f  Alcor Micro Corp.
 	2802  Monterey Keyboard
 	5492  Hub
+	6232  Hi-Speed 16-in-1 Flash Card Reader/Writer
 	9213  MacAlly Kbd Hub
 	9215  AU9814 Hub
 	9254  Hub
@@ -1438,11 +1555,13 @@
 	0050  Zip CD 650 Writer
 	0053  CDRW55292EXT CD-RW External Drive
 	006d  HipZip MP3 Player
+	015d  Super DVD Writer
 	1052  DVD+RW External Drive
 059c  A-Trend Technology Co., Ltd
 059d  Advanced Input Devices
 059e  Intelligent Instrumentation
 059f  LaCie, Ltd
+	0211  PocketDrive
 	0212  PocketDrive
 	a601  HardDrive
 05a0  Vetronix Corp.
@@ -1473,12 +1592,17 @@
 	0202  Apple Keyboard [ALPS]
 	0205  Apple Extended Keyboard [Mitsumi]
 	0206  Apple Extended Keyboard [Mitsumi]
+	020e  Apple Internal Keyboard/Trackpad
+	020f  Apple Internal Keyboard/Trackpad
 	0301  iMac Mouse [Mitsumi/Logitech]
 	0302  Apple Optical Mouse [Fujitsu]
 	1001  Apple Keyboard Hub [ALPS]
 	1002  Apple Extended Keyboard Hub [Mitsumi]
 	1101  Speakers
 	1201  3G iPod
+	1300  iPod Shuffle
+	8202  HCF V.90 Data/Fax Modem
+	8203  Bluetooth HCI
 05ad  Y.C. Cable U.S.A., Inc.
 05ae  Synopsys, Inc.
 05af  Jing-Mold Enterprise Co., Ltd
@@ -1517,6 +1641,7 @@
 	0101  RDC-5300 Camera
 	2201  RDC-7 Camera
 	2205  Caplio RR30 / Medion MD 6126 Camera
+	2212  Caplio R1v Camera
 05cb  PowerVision Technologies, Inc.
 	1483  PV8630 interface (scanners, webcams)
 05cc  ELSA AG
@@ -1559,6 +1684,7 @@
 	00a0  Phantom 336CX/C3 (#2)
 	00b6  ScanMaker V6UPL
 	1011  NHJ Che-ez! Kiss Digital Camera
+	1018  Digital Dream Enigma 1.3
 	30ce  ScanMaker 3800
 	30cf  ScanMaker 4800
 	30e6  ScanMaker i320
@@ -1568,6 +1694,7 @@
 05db  Sun Corp. (Suntac?)
 05dc  Lexar Media, Inc.
 	0080  Jumpdrive Secure 64MB
+	0200  JumpDrive 2.0 Pro
 	0300  Jumpdrive Geysr
 	b018  Multi-Card Reader
 05dd  Delta Electronics, Inc.
@@ -1577,17 +1704,20 @@
 05e2  ElecVision, Inc.
 05e3  Genesys Logic, Inc.
 	000a  Keyboard with PS/2 Port
-	000b  Mouse 
+	000b  Mouse
 	0100  Nintendo Game Boy Advance SP
 	0120  Pacific Image Electronics PrimeFilm 1800u slide/negative scanner
 	0300  GLUSB98PT Parallel Port
 	0406  Hub
 	0502  GL620USB GeneLink USB-USB Bridge
+	0604  USB 1.1 Hub
+	0605  USB 2.0 Hub [ednet]
 	0660  USB 2.0 Hub
 	0700  SIIG US2256 CompactFlash Card Reader
 	0701  USB 2.0 IDE Adapter
 	0702  USB 2.0 IDE Adapter
 	0703  Card Reader
+	0710  USB 2.0 33-in-1 Card Reader
 	0760  Card Reader
 	07A0  Pen Flash
 	1205  Afilias Optical Mouse H3003
@@ -1614,6 +1744,7 @@
 	0081  Kinesis Integrated Hub
 	020b  PS2 Adapter
 	0232  X-Keys Switch Interface, Programming Mode
+	0261  X-Keys Switch Interface, SPLAT Mode
 	0264  X-Keys Switch Interface, Composite Mode
 05f5  Unixtar Technology, Inc.
 05f6  AOC International
@@ -1651,6 +1782,7 @@
 	0001  MacAlly Keyboard
 	2101  Keyboard
 	5811  ACK-571U Wireless Keyboard
+	a001  Maxwell Compact Pc PM3
 060c  EEH Datalink GmbH
 060d  Auctor Corp.
 060e  Transmonde Technologies, Inc.
@@ -1665,6 +1797,11 @@
 0618  MacAlly
 	0101  Mouse
 0619  Seiko Instruments, Inc.
+061a  Veridicom International, Inc.
+	0110  5thSense Fingerprint Sensor
+	0200  FPS200 Fingerprint Sensor
+	8200  VKI-A Fingerprint Sensor/Flash Storage (dumb)
+	9200  VKI-B Fingerprint Sensor/Flash Storage (smart)
 061b  Promptus Communications, Inc.
 061c  Act Labs, Ltd
 061d  Quatech, Inc.
@@ -1714,7 +1851,7 @@
 0647  Acton Research Corp.
 	0100  ARC SpectraPro UV/VIS/IR Monochromator/Spectrograph
 	0101  ARC AM-VM Mono Airpath/Vacuum Monochromator/Spectrograph
-	0102  ARC Inspectrum Mono 
+	0102  ARC Inspectrum Mono
 	0103  ARC Filterwheel
 	03e9  Inspectrum 128x1024 F VIS Spectrograph
 	03ea  Inspectrum 256x1024 F VIS Spectrograph
@@ -1765,9 +1902,12 @@
 066d  Entrega, Inc.
 066e  Acer Semiconductor America, Inc.
 066f  SigmaTel, Inc.
+	004b  A-Max PA11 MP3 Player
 	3400  STMP3400 D-Major MP3 Player
 	3410  STMP3410 D-Major MP3 Player
 	4200  STIr4200 IrDA Bridge
+	4210  STIr4210 IrDA Bridge
+	8004  MSCNMMC MP3 Player
 	8202  Jens of Sweden / I-BEAD 150M/150H MP3 player
 0672  Labtec, Inc.
 	1041  LCS1040 Speaker System
@@ -1793,6 +1933,7 @@
 	2501  PL2501 USB-USB Bridge (USB 2.0)
 	2515  Flash Disk Embedded Hub
 	2517  Flash Disk Mass Storage Device
+	3507  PL3507 ATAPI6 Bridge 
 067c  Efficient Networks, Inc.
 	1001  Siemens SpeedStream 100MBps Ethernet
 	1022  Siemens SpeedStream 1022 802.11b Adapter
@@ -1866,6 +2007,7 @@
 	0005  CryptoBox v1.2
 069f  Allied Data Technologies BV
 	0010  Tornado Speakerphone FaxModem 56.0
+	0011  Tornado Speakerphone FaxModem 56.0
 06a2  Topro Technology, Inc.
 06a3  Saitek PLC
 	0006  Cyborg Gold Joystick
@@ -1876,6 +2018,7 @@
 	053f  X36F Flightstick
 	100a  SP550 Pad and Joystick Combo
 	100b  SP550 Pad
+	3509  P3000 RF GamePad
 06a4  Xiamen Doowell Electron Co., Ltd
 06a5  Divio
 	0000  Typhoon Webcam 100k [nw8000]
@@ -1893,7 +2036,8 @@
 06af  Harting, Inc. of North America
 06b8  Pixela Corp.
 06b9  Alcatel Telecom
-	4061  Speed Touch ISDN or ADSL Modem
+	0121  SpeedTouch 121g Wireless Dongle
+	4061  SpeedTouch ISDN or ADSL Modem
 	a5a5  DynaMiTe Modem
 06ba  Smooth Cord & Connector Co., Ltd
 06bb  EDA, Inc.
@@ -1944,6 +2088,7 @@
 06c9  Taxan (Europe), Ltd
 06ca  Newer Technology, Inc.
 06cb  Synaptics, Inc.
+	0009  Composite TouchPad and TrackPoint
 06cc  Terayon Communication Systems
 06cd  Keyspan
 	0101  USA-28 PDA [preenum]
@@ -1986,6 +2131,7 @@
 	f107  MT5634ZBA-USB-V92 MultiModemUSB
 06e1  ADS Technologies, Inc.
 	0008  UBS-10BT Ethernet [klsi]
+	a190  Instand VCD Usb Capture
 06e4  Alcatel Microelectronics
 06e6  Tiger Jet Network, Inc.
 06ea  Sirius Technologies
@@ -2029,6 +2175,7 @@
 	0240  PS/2 to USB Converter
 	0300  BAY-3U1S1P Parallel Port
 	0302  Parallel Port
+	0900  SVGA Adapter
 0713  Interval Research Corp.
 0714  NewMotion, Inc.
 	0003  ADB to USB convertor
@@ -2054,8 +2201,12 @@
 	9000  ACR38 AC1038-based Smart Card Reader
 	90cc  ACR38 SmartCard Reader
 0731  Susteen, Inc.
+	0528  SonyEricsson DCU-11 Cable
 0732  Goldfull Electronics & Telecommunications Corp.
 0733  ViewQuest Technologies, Inc.
+	0110  VQ110
+	1311  Digital Dream Epsilon 1.3
+	2211  Jenoptik
 	0401  CS330 WebCam
 	0402  M-318B WebCam
 	0430  Intel Pro Share WebCam
@@ -2085,12 +2236,15 @@
 	0002  PS/2 Adapter
 0755  Aureal Semiconductor
 0757  Network Technologies, Inc.
+075b  Sophisticated Circuits, Inc.
+	0001  Kick-off! Watchdog
 0763  Midiman
 	1001  Midisport 2x2
 	1010  Midisport 1x1
 	1020  Midisport 4x4
 	1030  Midisport 8x8
 0764  Cyber Power System, Inc.
+	0005  Cyber Power UPS
 0765  X-Rite, Inc.
 0766  Jess-Link Products Co., Ltd
 0767  Tokheim Corp.
@@ -2133,6 +2287,8 @@
 	0810  SDDR-75 ImageMate CF-SM Reader
 	0830  ImageMate CF/MMC/SD Reader
 	5150  SDCZ2 Cruzer Mini Flash Drive (thin)
+	5151  Cruzer Micro 256/512MB Flash Drive
+	7104  Cruzer Micro Mini 256MB Flash Drive
 	7112  Cruzer Micro 128MB Flash Drive
 	7113  Cruzer Micro 256MB Flash Drive
 	8185  SDCZ2 Cruzer Mini Flash Drive (older, thick)
@@ -2182,6 +2338,7 @@
 	0001  Ether USB-T Ethernet [klsi]
 	0004  FEther USB-TX Ethernet [pegasus]
 	0012  Stick-11 802.11b Adapter
+	7613  Stick-11 V2 802.11b Adapter
 07ab  Freecom Technologies
 	fc01  IDE bridge
 	fc03  USB2-IDE IDE bridge
@@ -2193,7 +2350,10 @@
 	0001  ISDN TA
 07b1  IMP, Inc.
 07b2  Motorola BCS, Inc.
-	4100  SB4100 Cable Modem
+	4100  SurfBoard SB4100 Cable Modem
+	4200  SurfBoard SB4200 Cable Modem
+	5100  SurfBoard SB5100 Cable Modem
+	5120  Surfboard SB5120 Cable Modem (RNDIS)
 07b3  Plustek, Inc.
 	0001  OpticPro 1212U Scanner
 	0010  OpticPro U12 Scanner
@@ -2207,7 +2367,8 @@
 07b4  Olympus Optical Co., Ltd
 	0100  Camedia C-2100/C-3000 Ultra Zoom Camera
 	0102  Camedia E-10/C-220/C-50 Camera
-	0105  Camedia C-310Z/C-700/C-750UZ/C-755/C-3040/C-4000 Zoom Camera
+	0105  Camedia C-310Z/C-700/C-750UZ/C-755/C-765UZ/C-3040/C-4000/C-5050Z/D-560 Zoom Camera
+	0112  MAUSB-100 xD Card Reader
 	0114  C-350Z Camera
 	0203  Digital Voice Recorder DW-90
 	0206  Digital Voice Recorder DS-330
@@ -2262,11 +2423,13 @@
 07cf  Casio Computer Co., Ltd
 	1001  QV-8000SX/5700/3000EX Digicam
 	2002  E-125 Cassiopeia Pocket PC
-	3801  Casio WMP-1 MP3-Watch
+	3801  WMP-1 MP3-Watch
+	4001  Label Printer KL-P1000
 	4500  LV-20 Digital Camera
 07d0  Dazzle
 	0001  Digital Video Creator I
 	0002  Global Village VideoFX Grabber
+	0003  Fusion Model DVC-50 Rev 1 (NTSC)
 	0004  DVC-800 (PAL) Grabber
 07d1  D-Link System
 07d2  Aptio Products, Inc.
@@ -2287,6 +2450,8 @@
 07ea  Iwatsu Electric Co., Ltd
 07eb  Double-H Technology Co., Ltd
 07ec  Taiyo Electric Wire & Cable Co., Ltd
+07ee  Torex Retail (formerly Logware)
+	0002  Cash Drawer I/F
 07f6  Circuit Assembly Corp.
 07f7  Century Corp.
 07f9  Dotop Technology, Inc.
@@ -2300,6 +2465,11 @@
 	9700  2986L FaxModem
 0809  Genicom Technology, Inc.
 080a  Evermuch Technology Co., Ltd
+080c  Datalogic S.p.A.
+	0300  Gryphon D120 Barcode Scanner
+	0400  Gryphon D120 Barcode Scanner
+	0500  Gryphon D120 Barcode Scanner
+	0600  Gryphon M100 Barcode Scanner
 080d  Teco Image Systems Co., Ltd
 	0102  Hercules Scan@home 48
 0810  Personal Communication Systems, Inc.
@@ -2326,7 +2496,7 @@
 	0040  Palm M125
 	0050  Palm M130
 	0060  Palm Tungsten T / Zire 71
-	0080  Palm 
+	0080  Palm
 0832  Kouwell Electronics Corp.
 0833  Sourcenext Corp.
 0835  Action Star Enterprise Co., Ltd
@@ -2347,7 +2517,13 @@
 0844  Welland Industrial Co., Ltd
 0846  NetGear, Inc.
 	1001  EA101 Ethernet [klsi]
+	4110  MA111 WiFi (v1)
+	4200  WG121 WiFi (v1)
+	4210  WG121 WiFi (v2)
+	4220  WG111 WiFi (v1)
 	4230  MA111 WiFi
+	4240  WG111 WiFi (v2)
+	6a00  WG111 WiFi (v2)
 084d  Minton Optic Industry Co., Inc.
 	0003  S-Cam F5 Digital Camera
 	0011  Argus DC3500 Digital Camera
@@ -2372,11 +2548,15 @@
 	000b  Portstation Dual PS/2 Port
 	0299  Colorvision, Inc. Monitor Spyder
 	8027  PGSDB9 Serial Port
+085c  ColorVision, Inc.
+	0200  Monitor Spyder
 0862  Teletrol Systems, Inc.
 0863  Filanet Corp.
 0864  NetGear, Inc.
-	4100  MA101 802.11b Adapter 
+	4100  MA101 802.11b Adapter
 	4102  MA101 802.11b Adapter
+0867  Data Translation, Inc.
+	9812  ECON Data acquisition unit
 086a  Emagic Soft-und Hardware GmbH
 086c  DeTeWe - Deutsche Telephonwerke AG & Co.
 	1001  Eumex 504PC ISDN TA
@@ -2432,9 +2612,14 @@
 	0024  Tablet
 	0102  DualCam
 	0103  Pocket DV Digital Camera
+	0104  Pocket DVII
+	0106  Pocket DV3100+
 	0111  PenCam VGA Plus
+	2008  Mini PenCam 2
 	2010  Pocket CAM 3 Mega (webcam)
 	2011  Pocket CAM 3 Mega (storage)
+	2018  Pencam SD 2
+	2024  Pocket DV3500
 08cd  Jue Hsun Ind. Corp.
 08ce  Long Well Electronics Corp.
 08cf  Productivity Enhancement Products
@@ -2475,6 +2660,9 @@
 08f1  CTI Electronics Corp.
 08f5  SysTec Co., Ltd
 08f6  Logic 3 International, Ltd
+08f7  Vernier
+	0001  LabPro
+	0002  EasyTemp
 08f8  Keen Top International Enterprise Co., Ltd
 08f9  Wipro Technologies
 08fa  Caere
@@ -2490,6 +2678,7 @@
 	1540  Digitex Container Flash Disk
 090b  Neurosmith
 090c  Feiya Technology Corp.
+	1000  Memory Bar
 090d  Multiport Computer Vertriebs GmbH
 090e  Shining Technology, Inc.
 090f  Fujitsu Devices, Inc.
@@ -2501,7 +2690,7 @@
 0919  Tiger Electronics
 	0100  Fast Flicks Digital Camera
 091e  Garmin International
-	0003  GPSmap 60C / GPS 18 / Vista C
+	0003  GPSmap (various models)
 0920  Echelon Co.
 0921  GoHubs, Inc.
 0922  Dymo-CoStar Corp.
@@ -2521,6 +2710,7 @@
 092a  Toshiba Information & Industrial Sys. And Services
 092b  Sena Technologies, Inc.
 0930  Toshiba Corp.
+	6519  Kingston DataTraveler 2.0 USB Stick
 	6533  512M USB Stick
 0931  Harmonic Data Systems, Ltd
 0932  Crescentec Corp.
@@ -2528,7 +2718,9 @@
 0934  Netcom Systems
 0939  Lumberg, Inc.
 093a  Pixart Imaging, Inc.
+	2468  Easy Snap Snake Eye WebCam
 093b  Plextor Corp.
+	0042  PX-712UF DVD RW
 093c  Intrepid Control Systems, Inc.
 	0601  ValueCAN
 093d  InnoSync, Inc.
@@ -2598,7 +2790,8 @@
 09a8  Lin Shiung Enterprise Co., Ltd
 09a9  Smart Card Technologies Co., Ltd
 09aa  Intersil Corp.
-	3642  Prism2.x 802.11b Adapter
+	1000  Prism GT 802.11b/g Adapter
+	3642  Prism 2.x 802.11b Adapter
 09ae  Tripp Lite
 09b2  Franklin Electronic Publishers, Inc.
 	0001  eBookman Palm Computer
@@ -2678,6 +2871,7 @@
 	0004  Pentax Optio 330
 	0006  Pentax Optio S
 	0007  Pentax Optio 550
+	003d  Pentax Optio S55
 0a18  Heidelberger Druckmaschinen AG
 0a19  Hua Geng Technologies, Inc.
 0a21  Medtronic Physio Control Corp.
@@ -2699,6 +2893,8 @@
 0a4c  Computex Co., Ltd
 0a4d  Evolution Electronics, Ltd
 	008e  MK-249C MIDI Keyboard
+	00a3  MK-461C MIDI Keyboard
+	00f5  UC-33e MIDI Controller
 0a4e  Steinberg Soft-und Hardware GmbH
 0a4f  Litton Systems, Inc.
 0a50  Mimaki Engineering Co., Ltd
@@ -2725,6 +2921,7 @@
 0a6d  UPS Manufacturing
 0a6e  Benwin
 0a6f  Core Technology, Inc.
+	0400  Xanboo
 0a70  International Game Technology
 0a72  Sanwa Denshi
 0a7d  NSTL, Inc.
@@ -2754,6 +2951,14 @@
 0aa6  Perception Digital, Ltd
 	0101  Hercules Jukebox
 0aa7  Wincor Nixdorf GmbH & Co KG
+	0200  POS Display BA63
+	0201  POS Display BA66
+	0300  POS Printer TH210
+	0302  POS Printer TH220
+	0305  Lottery Printer XiPrintPlus
+	0306  POS Printer TH320
+	0308  POS Printer TH420
+	4304  Banking Printer TP07
 0aa8  TriGem Computer, Inc.
 0aa9  Baromtec Co.
 	f01b  Medion MD 6242 MP3 Player
@@ -2774,12 +2979,17 @@
 0ac6  Singing Electrons, Inc.
 0ac7  Panwest Corp.
 0ac8  Z-Star Microelectronics Corp.
-	301b  Sansun SN-510 WebCam [hv713d]
+	0302  ZC0302 WebCam
+	301b  ZC0301 WebCam
+	303b  ZC0303 WebCam
 0ac9  Micro Solutions, Inc.
 	0000  Backpack CD-ReWriter
-	0011  Backpack 40GB Hard Drive 
+	0011  Backpack 40GB Hard Drive
 0acc  Koga Electronics Co.
 0acd  ID Tech
+0ace  ZyDAS
+	1201 802.11b WiFi
+	1211 802.11b/g USB2 WiFi
 0acf  Intoto, Inc.
 0ad0  Intellix Corp.
 0ad1  Remotec Technology, Ltd
@@ -2802,11 +3012,14 @@
 	0101  Digital TV USB Receiver (DVB-S/T/C / ATSC)
 0af9  Hama, Inc.
 	0010  USB SightCam 100
+	0011  Micro Innovations IC50C WebCam
 0afc  Zaptronix Ltd
 0afd  Tateno Dennou, Inc.
 0afe  Cummins Engine Co.
 0aff  Jump Zone Network Products, Inc.
 0b05  ASUSTek Computer, Inc.
+0b0c  Todos Data System AB
+	0009 Todos Argos Mini II Smart Card Reader
 0b0e  GN Netcom
 0b0f  AVID Technology
 0b10  Pcally
@@ -2844,10 +3057,13 @@
 	1008  Technotrend/Hauppauge DEC2000-t
 	1009  Technotrend/Hauppauge DEC2540-t
 0b49  ASCII Corp.
+	064f  Trance Vibrator
 0b4b  Pine Corp. Ltd.
 	0100  D'music MP3 Player
 0b4e  Musical Electronics, Ltd
 0b50  Dumpries Co., Ltd
+0b51  Comfort Keyboard Co.
+	0020  Comfort Keyboard
 0b52  Colorado MicroDisplay, Inc.
 0b54  Sinbon Electronics Co., Ltd
 0b56  TYI Systems, Ltd
@@ -2887,10 +3103,13 @@
 	7762  Oz776 SmartCard Reader
 0b98  Playmates Toys, Inc.
 0b99  Audio International, Inc.
+0b9b  Dipl.-Ing. Stefan Kunde
+	4012  Reflex RC-controller Interface
 0b9d  Softprotec Co.
 0b9f  Chippo Technologies
 0baf  U.S. Robotics
 	00eb  USR1120 802.11b Adapter
+	0118  U5 802.11g Adapter
 	6112  FaxModem Model 5633
 0bb0  Concord Camera Corp.
 0bb1  Infinilink Corp.
@@ -2899,6 +3118,7 @@
 0bb3  Ofuji Technology
 0bb4  High Tech Computer Corp.
 	00ce  mmO2 XDA GSM/GPRS Pocket PC
+	00cf  SPV C500 Smart Phone
 	0a02  Himalaya GSM/GPRS Pocket PC
 	0a51  SPV C400 / T-Mobile SDA GSM/GPRS Pocket PC
 0bb5  Murata Manufacturing Co., Ltd
@@ -2972,7 +3192,7 @@
 0c23  Lernout + Hauspie
 0c24  Taiyo Yuden
 0c25  Sampo Corp.
-0x2e  Metro
+0c2e  Metro
 	0200  Metrologic Scanner
 0c35  Eagletron, Inc.
 0c36  E Ink Corp.
@@ -2991,6 +3211,7 @@
 	6005  Sweex Mini WebCam
 	6029  Triplex i-mini PC Camera
 	602a  Meade ETX-105EC Camera
+	602c  Clas Ohlson TWC-30XOP WebCam
 0c46  WaveRider Communications, Inc.
 0c4b  Reiner SCT Kartensysteme GmbH
 	0100  cyberJack e-com/pinpad
@@ -3045,6 +3266,9 @@
 0cad  Motorola CGISS
 0cae  Ascom Business Systems, Ltd
 0caf  Buslink
+	2515  Flash Disk Embedded Hub
+	2516  Flash Disk Security Device
+	2517  Flash Disk Mass Storage Device
 	3a00  Hard Drive
 0cb0  Flying Pig Systems
 0cb1  Innovonics, Inc.
@@ -3080,6 +3304,7 @@
 0cde  Z-Com
 	0002  XI-725/726 Prism2.5 802.11b Adapter
 	0005  XI-735 Prism3 802.11b Adapter
+	0006  Medion 40900 802.11b Adapter
 0cf1  e-Conn Electronic Co., Ltd
 0cf2  ENE Technology, Inc.
 0cf3  Atheros Communications, Inc.
@@ -3118,6 +3343,11 @@
 0d40  Ascor, Inc.
 0d41  Ta Yun Terminals Industrial Co., Ltd
 0d42  Full Der Co., Ltd
+0d46  Kobil Systems GmbH
+	3003  mIDentity Light / KAAN SIM III
+	4000  mIDentity (mass storage)
+	4001  mIDentity Basic/Classic (composite device)
+	4081  mIDentity Basic/Classic (installationless)
 0d49  Maxtor
 0d4a  NF Corp.
 0d4b  Grape Systems, Inc.
@@ -3144,6 +3374,7 @@
 0d63  Fritz Gegauf AG
 0d64  DXG Technology Corp.
 	0107  Horus MT-409 Camera
+	0303  DXG-305V Camera
 0d65  KMJP Co., Ltd
 0d66  TMT
 0d67  Advanet, Inc.
@@ -3164,12 +3395,13 @@
 0d7d  Phison Electronics Corp.
 	0100  PS1001/1011/1006/1026 Flash Disk
 	0110  Gigabyte FlexDrive
-	0240  I/O Magic Drive
+	0240  I/O-Magic/Transcend 6-in-1 Card Reader
 	110E  NEC uPD720121/130 USB-ATA/ATAPI Bridge
 	1240  Apacer 6-in-1 Card Reader 2.0
 	1300  Flash Disk
 	1320  PS2031 Flash Disk
 	1420  PS2044 Pen Drive
+	1470  Vosonic X's-Drive II+ VP2160
 0d7e  American Computer & Digital Components
 0d7f  Essential Reality LLC
 0d80  H.R. Silvine Electronics, Inc.
@@ -3179,6 +3411,7 @@
 0d8a  King Jim Co., Ltd
 0d8b  Ascom Telecommunications, Ltd
 0d8c  C-Media Electronics, Inc.
+	000c  Audio Adapter
 0d8d  Promotion & Display Technology, Ltd
 0d8e  Global Sun Technology, Inc.
 	7100  802.11b Adapter
@@ -3207,11 +3440,15 @@
 0da3  Nippon Electro-Sensory Devices Corp.
 0da4  Polar Electro OY
 0da7  IOGear, Inc.
+0da8  softDSP Co., Ltd
+	0001  SDS 200A Oscilloscope
 0dab  Cubig Group
 	0100  DVR/CVR-M140 MP3 Player
 0dad  Westover Scientific
 0db0  Micro Star International
 	1967  Bluetooth Dongle
+	4011  Medion Flash XL V2.0 Card Reader
+	697a  Bluetooth Dongle
 	6982  Medion Flash XL V2.7A Card Reader
 0db1  Wen Te Electronics Co., Ltd
 0db2  Shian Hwi Plug Parts, Plastic Factory
@@ -3237,6 +3474,8 @@
 0dd4  Custom Engineering SPA
 0dd5  California Micro Devices
 0dd7  Kocom Co., Ltd
+0dd8  Netac Technology Co., Ltd
+	e007  OnlyDisk U222 Pendrive
 0dd9  HighSpeed Surfing
 0dda  Integrated Circuit Solution, Inc.
 0ddb  Tamarack, Inc.
@@ -3262,7 +3501,7 @@
 0e17  Walex Electronic, Ltd
 0e1b  Crewave
 0e21  Cowon Systems, Inc.
-	0300  iAudio CW200 
+	0300  iAudio CW200
 0e23  Liou Yuane Enterprise Co., Ltd
 0e25  VinChip Systems, Inc.
 0e26  J-Phone East Co., Ltd
@@ -3358,7 +3597,7 @@
 0ee0  Shima Seiki Mfg., Ltd
 0ee1  Sarotech Co., Ltd
 0ee2  AMI Semiconductor, Inc.
-0ee3  ComTrue Technology Corp. 
+0ee3  ComTrue Technology Corp.
 	1000  Image Tank 1.5
 0ee4  Sunrich Technology, Ltd
 0eee  Digital Stream Technology, Inc.
@@ -3389,7 +3628,7 @@
 0f21  IOI Technology Corp.
 0f22  Senior Industries, Inc.
 0f23  Leader Tech Manufacturer Co., Ltd
-0f24  Flex-P Industries, Snd., Bhd. 
+0f24  Flex-P Industries, Snd., Bhd.
 0f2d  ViPower, Inc.
 0f2e  Geniality Maple Technology Co., Ltd
 0f2f  Priva Design Services
@@ -3457,6 +3696,7 @@
 0fca  Research In Motion, Ltd.
 	0001  Blackberry Handheld
 0fce  Sony Ericsson Mobile Communications AB
+	d017  K608i Phone
 0fcf  Dynastream Innovations, Inc.
 0fd0  Tulip Computers B.V.
 0fd4  Tenovis GmbH & Co., KG
@@ -3464,6 +3704,11 @@
 0fdc  Micro Plus
 0fe4  IN-Tech Electronics, Ltd
 0fe5  Greenconn (U.S.A.), Inc.
+0fe9  DVICO
+	db00  FusionHDTV DVB-T (MT352+LgZ201) (uninitialized)
+	db01  FusionHDTV DVB-T (MT352+LgZ201) (initialized)
+	db10  FusionHDTV DVB-T (MT352+Thomson7579) (uninitialized)
+	db11  FusionHDTV DVB-T (MT352+Thomson7579) (initialized)
 0fea  United Computer Accessories
 0feb  CRS Electronic Co., Ltd
 0fec  UMC Electronics Co., Ltd
@@ -3477,6 +3722,7 @@
 1001  Ritronics Components (S) Pte., Ltd
 1003  Sigma Corp.
 1004  LG Electronics, Inc.
+	1fae  U8120 3G Cellphone
 	6000  VX4400/VX6000 Cellphone
 	6800  CDMA Modem
 1005  Apacer Technology, Inc.
@@ -3497,6 +3743,8 @@
 1015  Softronics Pty., Ltd
 1016  Xiamen Hung's Enterprise Co., Ltd
 1017  Speedy Industrial Supplies, Pte., Ltd
+1020  Labtec
+	000a Wireless Optical Mouse
 1022  Shinko Shoji Co., Ltd
 1025  Hyper-Paltek
 	005e  USB DVB-T device
@@ -3560,7 +3808,7 @@
 10a9  SK Teletech Co., Ltd
 10aa  Cables To Go
 10ab  USI Co., Ltd
-	10c5  Sony-Ericsson datacable
+	10c5  Sony-Ericsson / Samsung DataCable
 10ac  Honeywell, Inc.
 10ae  Princeton Technology Corp.
 10b5  Comodo (PLX?)
@@ -3594,6 +3842,7 @@
 10d5  Uni Class Technology Co., Ltd
 10d6  Actions Semiconductor Co., Ltd
 	1000  MP3 Player
+	1100  MPMan MP-Ki 128 MP3 Player/Recorder
 10de  Authenex, Inc.
 10df  In-Win Development, Inc.
 10e0  Post-Op Video, Inc.
@@ -3619,6 +3868,7 @@
 112f  Cellon International, Inc.
 1130  Tenx Technology, Inc.
 1131  Integrated System Solution Corp.
+	1001  KY-BT100 Bluetooth Adapter
 1132  Toshiba Corp., Digital Media Equipment [hex]
 	4331  PDR-M4/M5/M70 Digital Camera
 	4332  PDR-M60 Digital Camera
@@ -3658,6 +3908,10 @@
 1199  Sierra Wireless, Inc.
 	0112  CDMA 1xEVDO PC Card, AirCard 580
 119a  ZHAN QI Technology Co., Ltd
+119b  ruwido austria GmbH
+	0400  Infrared Keyboard V2.01
+11a0  Chipcon AS
+	eb11 CC2400EB 2.0 ZigBee Sniffer
 11a3  Technovas Co., Ltd
 11aa  GlobalMedia Group, LLC
 11ab  Exito Electronics Co., Ltd
@@ -3682,6 +3936,8 @@
 	1177  F8E842-DL Mouse
 124a  AirVast
 	4017  PC-Chips 802.11b Adapter
+124b  Nyko (Honey Bee)
+	4d01  Airflo EX Joystick
 1267  Logic3 / SpectraVideo plc
 	0201  A4Tech SWOP-3 Mouse
 	a001  JP260 PC Game Pad
@@ -3702,6 +3958,8 @@
 1310  Roper
 	0001  Class 1 Bluetooth Dongle
 1312  ICS Electronics
+131d  Natural Point
+	0155  TrackIR 3 Pro Head Tracker
 132b  Konica Minolta
 	0000  Dimage A2 Camera
 	0003  Dimage Xg Camera
@@ -3711,9 +3969,12 @@
 	000d  Dimage X50 Camera [storage?]
 	000f  Dimage X50 Camera [p2p?]
 	0010  Dimage G600 Camera
+	0012  Dimage Scan Elite5400 2
 	0013  Dimage X31 Camera
 	0015  Dimage G530 Camera
 	0017  Dimage Z3 Camera
+	0019  Dimage A200 Camera
+	0021  Dimage Z5 Camera
 1342  Mobility
 	0200  EasiDock 200 Hub
 	0201  EasiDock 200 Keyboard and Mouse Port
@@ -3722,17 +3983,29 @@
 134e  Digby's Bitpile, Inc. DBA D Bit
 1370  Swissbit
 	6828  Victorinox Flash Drive
+1398  Q-tec
+	2103  USB 2.0 Storage Device
+13b0  Alesis
+	000a  Photon X25 MIDI Controller
+13b1  Linksys
+	000b  WUSB11 v4.0 802.11b Adapter
+	0011  WUSB54GP v4.0 802.11g Adapter
+	0018  USB200M 10/100 Ethernet Adapter
 13d2  Shark Multimedia
 	0400  Pocket Ethernet [klsi]
 13d3  IMC Networks
 	3201  VisionDTV USB-Ter/HAMA USB DVB-T device cold
 	3202  VisionDTV USB-Ter/HAMA USB DVB-T device warm
+1453  Radio Shack
+	4026  26-183 Serial Cable
 1462  Micro Star International
 	5512  MegaStick-1 Flash Stick
 147a  Formosa Industrial Computing, Inc.
 1484  Elsa AG [hex]
 	1746  Ecomo 19H99 Monitor
 	7616  Elsa Hub
+148f  Ralink Technology, Corp.
+	2570  802.11g WiFi
 14aa  AVerMedia (again) or C&E
 	0001  Avermedia AverTV DVBT USB1.1 (cold)
 	0002  Avermedia AverTV DVBT USB1.1 (warm)
@@ -3743,9 +4016,13 @@
 	0001  HDReye High Dynamic Range Camera
 	0002  HDReye (before firmware loads)
 1520  Bitwire Corp.
+152e  LG (HLDS)
+	e001  GSA-5120D DVD-RW
 1546  U-Blox AG
 1554  Prolink Microsystems Corp.
 1568  Sunf Pu Technology Co., Ltd
+15c2  SoundGraph Inc.
+	ffdc  iMON PAD Remote Controller
 15c6  Laboratoires MXM
 15e8  SohoWare
 	9100  NUB100 Ethernet [pegasus]
@@ -3789,14 +4066,17 @@
 	0333  Modem
 	0408  Prism2.5 802.11b Adapter
 	0421  Prism2.5 802.11b Adapter
+	0500  BTM200B BlueTooth Adapter
 1690  Askey Computer Corp. [hex]
 	0101  Creative Modem Blaster DE5670
 	0103  Askey 1456 VQE-R3 Modem [conexant]
 	0109  Askey MagicXpress V.90 Pocket Modem [conexant]
 1696  Hitachi Video and Information System, Inc.
 1697  VTec Test, Inc.
+1706  BlueView Technologies, Inc.
 1733  Cellink Technology Co., Ltd
 	0101  RF Wireless Optical Mouse OP-701
+17eb  Cornice, Inc.
 1822  Twinhan
 	3201  VisionDTV USB-Ter/HAMA USB DVB-T device cold
 	3202  VisionDTV USB-Ter/HAMA USB DVB-T device warm
@@ -3812,6 +4092,10 @@
 2001  D-Link Corp. [hex]
 	3200  DWL-120 802.11b (Atmel RFMD503A) [usbvnetr]
 	3700  DWL-122 802.11b
+	3701  DWL-G120 Spinnaker 802.11b
+	3703  DWL-122 802.11b
+	3704  DWL-G122 802.11g rev. A2
+	3c00  DWL-G122 802.11g rev. B1 [ralink]
 	4000  DSB-650C Ethernet [klsi]
 	4001  DSB-650TX Ethernet [pegasus]
 	4002  DSB-650TX Ethernet [pegasus]
@@ -3822,6 +4106,8 @@
 2040  Hauppauge
 	9300  Hauppauge WinTV NOVA-T USB2 (cold)
 	9301  Hauppauge WinTV NOVA-T USB2 (warm)
+2101  ActionStar
+	0201  SIIG 4-to-2 Printer Switch
 2162  Creative (?)
 	500c  DE5771 Modem Blaster
 2222  MacAlly
@@ -3832,11 +4118,12 @@
 	2821  T720 GSM Phone
 	2822  V.120e GSM Phone
 	3002  A835 GSM Phone
-	3802  C330 GSM Phone
+	3802  C330/A780 GSM Phone
 	4002  A920/A925 UMTS Phone
 	4810  E398 Storage
 	4902  E398 GSM Phone
 	600c  A768i GSM Phone
+	604c  A780 GSM Phone (storage)
 	6631  CDC Modem
 	6604  Washington CDMA Phone
 22b9  eTurboTouch Technology, Inc.
@@ -3846,6 +4133,7 @@
 	0110  Pinnacle Studio PCTV USB (PAL)
 	0111  Miro PCTV USB
 	0112  Pinnacle Studio PCTV USB (NTSC) with FM radio
+	0208  Pinnacle Studio PCTV USB2
 	0210  Pinnacle Studio PCTV USB (PAL) with FM radio
 	0212  Pinnacle Studio PCTV USB (NTSC)
 	0214  Pinnacle Studio PCTV USB (PAL) with FM radio
@@ -3868,16 +4156,20 @@
 3125  Eagletron
 	0001  TrackerPod Camera Stand
 3176  Whanam Electronics Co., Ltd
+3340  Yakumo
+	0e3a  Pocket PC 300 GPS SL
 3504  Micro Star
 	f110  Security Key
 3538  Power Quotient International Co., Ltd
 	0001  Travel Flash
+	0042  Cool Drive U339 Flash Disk
 3579  DIVA
 	6901  Media Reader
 3636  InVibro
 3838  WEM
 	0001  5-in-1 Card Reader
 3923  National Instruments Corp.
+	703c  USB-485 RS485 Cable
 4102  iRiver, Ltd.
 	1001  iFP-100 series mp3 player
 	1003  iFP-300 series mp3 player
@@ -3890,19 +4182,28 @@
 	1105  iFP-500 series mp3 player (ums firmware)
 413c  Dell Computer Corp.
 	1002  Keyboard Hub
+	2002  SK-8125 Keyboard
 	2100  SK-3106 Keyboard
 	2101  SmartCard Reader Keyboard
+	2500  DRAC4 Remote Access Card
+	3010  Optical Wheel Mouse
 	4001  Axim X5
 	4002  Axim X3
 	4003  Axim X30
 	8100  TrueMobile 1180 802.11b Adapter
+	8103  Wireless 350 Bluetooth
+	a001  Hub
+	a700  Hub (in 1905FP LCD Monitor)
 4242  USB Design by Example
 	4201  Buttons and Lights HID device
 	4220  Echo 1 Camera
-4146  Iomega (?)
-	9281  Micro Mini 128MB Flash Drive
+4146  USBest Technology
+	9281  Iomega Micro Mini 128MB Flash Drive
+	ba01  Intuix Flash Drive
 4572  Shuttle, Inc.
 	4572  Shuttle PN31 Remote
+4586  Panram
+	1026  Crystal Bar Flash Drive
 4670  EMS Production
 	9394  Game Cube USB Memory Adaptor 64M
 5032  Grandtec
@@ -3910,6 +4211,8 @@
 	0bb9  Grandtec USB1.1 DVB-T (warm)
 	0fa0  Grandtec USB1.1 DVB-T (cold)
 	0fa1  Grandtec USB1.1 DVB-T (warm)
+5041  Linksys (?)
+	2234  WUSB54G 802.11g Adapter
 544d  Transmeta Corp.
 5543  UC-Logic Technology Corp.
 	0002  SuperPen WP3325U Tablet
@@ -3917,11 +4220,12 @@
 55aa  OnSpec Electronic, Inc.
 	1234  ATAPI Bridge
 	a103  Sandisk SDDR-55 SmartMedia Card Reader
+	b012  Mitsumi FA402M 8-in-2 Card Reader
 636c  CoreLogic, Inc.
 6666  Prototype product Vendor ID
 	0667  Smart Joy PSX, PS-PC Smart JoyPad
 6993  Freshtel
-	b001  FT-102 VoIP USB Phone 
+	b001  FT-102 VoIP USB Phone
 6a75  Shanghai Jujo Electronics Co., Ltd
 8086  Intel Corp.
 	0110  Easy PC Camera
@@ -3934,13 +4238,15 @@
 	c013  Wireless HID Station
 8341  EGO Systems, Inc.
 	2000  Flashdisk
-9710  Noname
+9710  MosChip Semiconductor
+	7705  Printer cable
 	7715  Printer cable
 c251  Keil Software, Inc.
 	2710  ULink
 eb1a  eMPIA Technology, Inc.
 	17de  KWorld V-Stream XPERT DTV - DVB-T USB cold
 	17df  KWorld V-Stream XPERT DTV - DVB-T USB warm
+	2710  SilverCrest WebCam
 	2800  Terratec Cinergy 200
 	2801  GrabBeeX+ Video Encoder
 
@@ -3977,6 +4283,8 @@ C 02  Communications
 	09  Device Management
 	0a  Mobile Direct Line
 	0b  OBEX
+	0c  Ethernet Emulation
+		07  Ethernet Emulation (EEM)
 C 03  Human Interface Devices
 	00  No Subclass
 		00  None
@@ -4044,9 +4352,15 @@ C dc  Diagnostic
 C e0  Wireless
 	01  Radio Frequency
 		01  Bluetooth
+		02  Ultra WideBand Radio Control
+	02  Wireless USB Wire Adapter
+		01  Host Wire Adapter Control/Data Streaming
+		02  Device Wire Adapter Control/Data Streaming
+		03  Device Wire Adapter Isochronous Streaming
 C ef  Miscellaneous Device
 	02  Common Class
 		01  Interface Association
+		02  Wire Adapter Multifunction Peripheral
 C fe  Application Specific Interface
 	01  Device Firmware Update
 	02  IRDA Bridge
@@ -4541,7 +4855,7 @@ HUT 07  Keyboard
 	07e  Find
 	07f  Mute
 	080  Volume Up
-	081  Volume DOwn
+	081  Volume Down
 	082  Locking Caps Lock
 	083  Locking Num Lock
 	084  Locking Scroll Lock
@@ -4555,12 +4869,12 @@ HUT 07  Keyboard
 	08c  International 6 (PC98)
 	08d  International 7 (Toggle Single/Double Byte Mode)
 	08e  International 8
-	08f  International 9A
+	08f  International 9
 	090  LANG 1 (Hangul/English Toggle, Korea)
 	091  LANG 2 (Hanja Conversion, Korea)
 	092  LANG 3 (Katakana, Japan)
 	093  LANG 4 (Hiragana, Japan)
-	094  LANG 5 (Zenkaku/Hnakaku, Japan)
+	094  LANG 5 (Zenkaku/Hankaku, Japan)
 	095  LANG 6
 	096  LANG 7
 	097  LANG 8
@@ -5601,3 +5915,22 @@ HCC 32  UK
 HCC 33  US
 HCC 34  Yugoslavia
 HCC 35  Turkish-F
+
+# List of Video Class Terminal Types
+
+# Syntax:
+# VT terminal_type  terminal_type_name
+
+VT 0100  USB Vendor Specific
+VT 0101  USB Streaming
+VT 0200  Input Vendor Specific
+VT 0201  Camera Sensor
+VT 0202  Sequential Media
+VT 0300  Output Vendor Specific
+VT 0301  Generic Display
+VT 0302  Sequential Media
+VT 0400  External Vendor Specific
+VT 0401  Composite Video
+VT 0402  S-Video
+VT 0403  Component Video
+
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index 1f7c9117..44983e80 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -3,14 +3,14 @@
 # Description:  universal (distro independent) generator for initial
 #               ramdisks for linux diskless clients 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 27-06-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 29-06-2006
 #               Nico Dietrich
 #               Felix Endres
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
 #               (c) 2006 - odlx.org project
 #
-# Version:      0.4.1a
+# Version:      0.4.5a
 
 # debug level of script itself
 DEBUG=1
@@ -59,10 +59,11 @@ D_DEFAULTCOUNTRY="<set in ~/distro-config/distro file>"
 
 usage()
 {
-  echo -e "mkdxsinitrd  [-gh] [-k kernel version] [-i path/file] \
+  echo -e "mkdxsinitrd  [-bgh] [-k kernel version] [-i path/file] \
 [-f module(s)] [-n module(s)] [-r path] [-s splashsize]\n"
   echo "OPTIONEN"
   echo "  -g     Benutze glibc als Basisbibliothek in der ramdisk."
+  echo "  -b     Use busybox instead of separate binaries."
   echo "  -h     Zeige Informationen zur Benutzung."
   echo "  -k Kernelversion"
   echo "        mkdxsinitrd  versucht  die  aktuellste  Kernelversion zu finden."
@@ -158,6 +159,8 @@ else
         -e "s,@@@COMETCEXCL@@@,${COMETCEXCL},g" \
         -e "s,@@@DATE@@@,${DATE},g;/^#[^!].*/d" \
           initrd-stuff/${FILENAME} >> ${INSTDIR}/${FILENAME}
+    [ -n $use_busybox ] && sed -e "s,/bin/sh,/bin/ash," \
+      -i ${INSTDIR}/${FILENAME}
   fi
 fi
 }
@@ -265,7 +268,7 @@ done
 #########################################################################
 # End of function declaration
 
-while getopts :hgk:i:r:o:s:f:n:Sut:d:v:I:V:a: a ; do
+while getopts :bhgk:i:r:o:s:f:n:Sut:d:v:I:V:a: a ; do
   case $a in
     \:|\?) 
     case $OPTARG in
@@ -286,6 +289,7 @@ while getopts :hgk:i:r:o:s:f:n:Sut:d:v:I:V:a: a ; do
     esac
     exit 1
     ;;
+    b)  use_busybox=1;;
     g)  use_glibc=1;;
     k)  KERNVER=$OPTARG;;
     i)  INITRD_PATH=$OPTARG ;;
@@ -414,55 +418,69 @@ mknod ${INSTDIR}/tmp/null c 1 3 &>/dev/null
 mknod ${INSTDIR}/tmp/kmsg c 1 11 &>/dev/null
 mknod ${INSTDIR}/tmp/ctl b 241 255 &>/dev/null
 
-# find and copy a shell to be used within initialramfs
-for bbins in bash ash sh; do
-  if cobi ${bbins} bin ; then 
-    ln -fs ${bbins} ${INSTDIR}/bin/sh
-    [ "${bbins}" != "bash" ] && ln -fs ${bbins} ${INSTDIR}/bin/bash
-    break
-  else echo "Binary not found (${bbins})"; fi
-done
-
-# find and copy ip setup binaries
-for bbins in ip ifconfig; do
-  if cobi ${bbins} bin ; then 
-    [ "${bbins}" = "ifconfig" ] && cobi route bin
-    break
-  else echo "Binary not found"; fi
-done
-
-# needed standard binaries (in init, servconfig, hwautocfg, ... scripts)
-for bbins in \
-    cat chmod chown chroot cp expr fdisk killall ln ls mkdir mkfs.ext2 \
-    modprobe mount portmap rmmod sed sort rm tar umount
-  do
-  cobi ${bbins} bin || echo "Program ${bbins} not found"
-done
+# test for the existance of busybox
+if [ -x busybox -a "$use_busybox" = 1 ] ; then
+  cp busybox ${INSTDIR}/bin
+  for bbins in [ arping ash cat chmod chown chroot cp date \
+        dd df dmesg echo expr fdisk free hwclock insmod ip \
+        kill killall ln ls lsmod mkdir mke2fs mkfs.ext2 \
+        mkfs.ext3 mknod modprobe mount mv ps rdate rm rmmod \
+        sed sort switch_root tar test tftp time udhcpc \
+        umount uname usleep vconfig vi; do
+    ln -s /bin/busybox ${INSTDIR}/bin/$bbins
+  done
+else
+  # find and copy a shell to be used within initialramfs
+  for bbins in bash ash sh; do
+    if cobi ${bbins} bin ; then 
+      ln -fs ${bbins} ${INSTDIR}/bin/sh
+      [ "${bbins}" != "ash" ] && ln -fs ${bbins} ${INSTDIR}/bin/ash
+      [ "${bbins}" != "bash" ] && ln -fs ${bbins} ${INSTDIR}/bin/bash
+      break
+    else echo "Binary not found (${bbins})"; fi
+  done
 
-# one of the dhcp clients
-for dhcp in dhclient dhcpcd pump ipconfig ; do
-  binfinder $dhcp && break;
-done
-cobi $dhcp bin
-mkdir -p ${INSTDIR}/var/{lib,run}
-
-# tftp client binary for configuration via file - get machine-setup per
-# tftp from dhcp (or specified other) server
-#fixme: irgendwann mal nur konditional ...
-for tftp in atftp tftp ; do
-  binfinder $tftp && break
-done
-cobi $tftp bin
-cp /lib/libnss_files.so.2 ${INSTDIR}/lib
+  # find and copy ip setup binaries
+  for bbins in ip ifconfig; do
+    if cobi ${bbins} bin ; then 
+      [ "${bbins}" = "ifconfig" ] && cobi route bin
+      break
+    else echo "Binary not found"; fi
+  done
 
-# binaries useful for debugging purposes
-if [ $IRFSDEBUG -gt 2 ] ; then
+  # needed standard binaries (in init, servconfig, hwautocfg, ... scripts)
   for bbins in \
-    date lsmod lsof ps strace time
-  do
+      cat chmod chown chroot cp expr fdisk killall ln ls mkdir mkfs.ext2 \
+      modprobe mount rmmod sed sort rm tar umount
+    do
     cobi ${bbins} bin || echo "Program ${bbins} not found"
-done
+  done
+
+  # binaries useful for debugging purposes
+  if [ $IRFSDEBUG -gt 2 ] ; then
+    for bbins in \
+      date lsmod lsof ps strace time
+    do
+      cobi ${bbins} bin || echo "Program ${bbins} not found"
+    done
+  fi
+
+  # tftp client binary for configuration via file - get machine-setup per
+  # tftp from dhcp (or specified other) server
+  #fixme: irgendwann mal nur konditional ...
+  for tftp in atftp tftp ; do
+    binfinder $tftp && break
+  done
+  cobi $tftp bin
+  cp /lib/libnss_files.so.2 ${INSTDIR}/lib
 fi
+  
+# one of the dhcp clients
+#for dhcp in dhclient dhcpcd pump ipconfig ; do
+#  binfinder $dhcp && break;
+#done
+#cobi $dhcp bin
+#mkdir -p ${INSTDIR}/var/{lib,run}
 
 # type of hotplug/udev/dev (for etc directories see above!!)
 for bbins in udev udevd udevstart udevtrigger udevsend
@@ -472,6 +490,7 @@ for bbins in udev udevd udevstart udevtrigger udevsend
 done
 
 # if nfs is used as clients root filesystem
+cobi portmap bin
 mkdir -p ${INSTDIR}/var/lib/nfs/state
 
 # if nbd or dnbd is used as clients root filesystem
author	Dirk von Suchodoletz	2006-06-30 01:27:12 +0200
committer	Dirk von Suchodoletz	2006-06-30 01:27:12 +0200
commit	ac5635ae692d39c7fe837155651049d432c93333 (patch)
tree	c3d34fbbc5f219fb8110d75595628e9e8bcbfbe3 /initrd
parent	bootsplash bugfix (diff)
download	core-ac5635ae692d39c7fe837155651049d432c93333.tar.gz core-ac5635ae692d39c7fe837155651049d432c93333.tar.xz core-ac5635ae692d39c7fe837155651049d432c93333.zip