--- pci-device.xml.org	2005-01-13 16:57:51.000000000 +0100
+++ pci-device.xml	2005-01-13 17:49:37.000000000 +0100
@@ -18784,7 +18784,10 @@
   </device>
   <device model='2482' vendor='8086' model_name='82801CA/CAM USB (Hub #1)'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
       <data class='last-updated'>2004-08-31</data>
@@ -18804,7 +18807,10 @@
   <device model='2483' model_name='82801CA/CAM SMBus Controller' subsystem_name='vpr Matrix 170B4' subvendor='8086' vendor='8086' subdevice='1958'/>
   <device model='2484' vendor='8086' model_name='82801CA/CAM USB (Hub #2)'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
       <data class='last-updated'>2004-08-31</data>
@@ -18853,7 +18859,10 @@
   <device model='2486' model_name="82801CA/CAM AC'97 Modem Controller" subsystem_name='MD56ORD V.92 MDC Modem' subvendor='14f1' vendor='8086' subdevice='5421'/>
   <device model='2487' vendor='8086' model_name='82801CA/CAM USB (Hub #3)'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
       <data class='last-updated'>2004-08-31</data>
@@ -18910,7 +18919,10 @@
   <device model='24c1' vendor='8086' model_name='82801DBL (ICH4-L) IDE Controller'/>
   <device model='24c2' vendor='8086' model_name='82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #1'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
     </data>
@@ -18933,7 +18945,10 @@
   <device model='24c3' model_name='82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) SMBus Controller' subsystem_name='Cx9 / Vx9 mainboard' subvendor='4c53' vendor='8086' subdevice='1090'/>
   <device model='24c4' vendor='8086' model_name='82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #2'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
     </data>
@@ -18970,7 +18985,10 @@
   <device model='24c6' model_name="82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller" subsystem_name='MIM2000' subvendor='1071' vendor='8086' subdevice='8160'/>
   <device model='24c7' vendor='8086' model_name='82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #3'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
     </data>
@@ -19051,7 +19069,10 @@
   <device model='24d1' model_name='82801EB (ICH5) SATA Controller' subsystem_name='D865PERL mainboard' subvendor='8086' vendor='8086' subdevice='524c'/>
   <device model='24d2' vendor='8086' model_name='82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
     </data>
@@ -19070,7 +19091,10 @@
   <device model='24d3' model_name='82801EB/ER (ICH5/ICH5R) SMBus Controller' subsystem_name='D865PERL mainboard' subvendor='8086' vendor='8086' subdevice='524c'/>
   <device model='24d4' vendor='8086' model_name='82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
     </data>
@@ -19101,7 +19125,10 @@
   <device model='24d6' vendor='8086' model_name="82801EB/ER (ICH5/ICH5R) AC'97 Modem Controller"/>
   <device model='24d7' vendor='8086' model_name='82801EB/ER (ICH5/ICH5R) USB UHCI #3'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
     </data>
@@ -19146,7 +19173,10 @@
   <device model='24dd' model_name='82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller' subsystem_name='D865PERL mainboard' subvendor='8086' vendor='8086' subdevice='524c'/>
   <device model='24de' vendor='8086' model_name='82801EB/ER (ICH5/ICH5R) USB UHCI Controller #4'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
     </data>
@@ -19390,7 +19420,10 @@
   <device model='2653' vendor='8086' model_name='82801FBM (ICH6M) SATA Controller'/>
   <device model='2658' vendor='8086' model_name='82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #1'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
       <data class='last-updated'>2004-04-26</data>
@@ -19400,7 +19433,10 @@
   <device model='2658' model_name='82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #1' subsystem_name='Optiplex GX280' subvendor='1028' vendor='8086' subdevice='0179'/>
   <device model='2659' vendor='8086' model_name='82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #2'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
       <data class='last-updated'>2004-11-19</data>
@@ -19410,7 +19446,10 @@
   <device model='2659' model_name='82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #2' subsystem_name='Optiplex GX280' subvendor='1028' vendor='8086' subdevice='0179'/>
   <device model='265a' vendor='8086' model_name='82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #3'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
       <data class='last-updated'>2004-11-19</data>
@@ -19420,7 +19459,10 @@
   <device model='265a' model_name='82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #3' subsystem_name='Optiplex GX280' subvendor='1028' vendor='8086' subdevice='0179'/>
   <device model='265b' vendor='8086' model_name='82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #4'>
     <data class='linux'>
-      <data class='module'>
+      <data version='[2.6,inf)' class='module'>
+        <data class='name'>uhci-hcd</data>
+      </data>
+      <data version='[2.2,2.6)' class='module'>
         <data class='name'>usb-uhci</data>
       </data>
       <data class='last-updated'>2004-11-19</data>