vserver 1.9.5.x5

[linux-2.6.git] / drivers / i2c / busses / i2c-i801.c

diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index e873ba0..6ec8b21 100644 (file)
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -30,6 +30,7 @@
     82801EB            24D3   (HW PEC supported, 32 byte buffer not supported)
     6300ESB            25A4
     ICH6               266A
+    ICH7               27DA
     This driver supports several versions of Intel's I/O Controller Hubs (ICH).
     For SMBus support, they are similar to the PIIX4 and are part
     of Intel's '810' and other chipsets.
@@ -548,57 +549,20 @@ static struct i2c_adapter i801_adapter = {
 };
 
 static struct pci_device_id i801_ids[] = {
-       {
-               .vendor =       PCI_VENDOR_ID_INTEL,
-               .device =       PCI_DEVICE_ID_INTEL_82801AA_3,
-               .subvendor =    PCI_ANY_ID,
-               .subdevice =    PCI_ANY_ID,
-       },
-       {
-               .vendor =       PCI_VENDOR_ID_INTEL,
-               .device =       PCI_DEVICE_ID_INTEL_82801AB_3,
-               .subvendor =    PCI_ANY_ID,
-               .subdevice =    PCI_ANY_ID,
-       },
-       {
-               .vendor =       PCI_VENDOR_ID_INTEL,
-               .device =       PCI_DEVICE_ID_INTEL_82801BA_2,
-               .subvendor =    PCI_ANY_ID,
-               .subdevice =    PCI_ANY_ID,
-       },
-       {
-               .vendor =       PCI_VENDOR_ID_INTEL,
-               .device =       PCI_DEVICE_ID_INTEL_82801CA_3,
-               .subvendor =    PCI_ANY_ID,
-               .subdevice =    PCI_ANY_ID,
-       },
-       {
-               .vendor =       PCI_VENDOR_ID_INTEL,
-               .device =       PCI_DEVICE_ID_INTEL_82801DB_3,
-               .subvendor =    PCI_ANY_ID,
-               .subdevice =    PCI_ANY_ID,
-       },
-       {
-               .vendor =       PCI_VENDOR_ID_INTEL,
-               .device =       PCI_DEVICE_ID_INTEL_82801EB_3,
-               .subvendor =    PCI_ANY_ID,
-               .subdevice =    PCI_ANY_ID,
-       },
-       {
-               .vendor =       PCI_VENDOR_ID_INTEL,
-               .device =       PCI_DEVICE_ID_INTEL_ESB_4,
-               .subvendor =    PCI_ANY_ID,
-               .subdevice =    PCI_ANY_ID,
-       },
-       {
-               .vendor =       PCI_VENDOR_ID_INTEL,
-               .device =       PCI_DEVICE_ID_INTEL_ICH6_16,
-               .subvendor =    PCI_ANY_ID,
-               .subdevice =    PCI_ANY_ID,
-       },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AA_3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801AB_3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_2) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_4) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_16) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_17) },
        { 0, }
 };
 
+MODULE_DEVICE_TABLE (pci, i801_ids);
+
 static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
 
@@ -631,7 +595,7 @@ static struct pci_driver i801_driver = {
 
 static int __init i2c_i801_init(void)
 {
-       return pci_module_init(&i801_driver);
+       return pci_register_driver(&i801_driver);
 }
 
 static void __exit i2c_i801_exit(void)