vserver 1.9.3

[linux-2.6.git] / drivers / ide / pci / generic.c

diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index ca99977..a4154e7 100644 (file)
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -77,8 +77,6 @@ static void __init init_hwif_generic (ide_hwif_t *hwif)
 
        if ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE) {
                ide_pci_device_t *unknown = unknown_chipset;
-//             unknown->vendor = dev->vendor;
-//             unknown->device = dev->device;
                init_setup_unknown(dev, unknown);
                return 1;
        }
@@ -99,15 +97,13 @@ static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_devi
        ide_pci_device_t *d = &generic_chipsets[id->driver_data];
        u16 command;
 
-       if (dev->device != d->device)
-               BUG();
-       if ((d->vendor == PCI_VENDOR_ID_UMC) &&
-           (d->device == PCI_DEVICE_ID_UMC_UM8886A) &&
+       if (dev->vendor == PCI_VENDOR_ID_UMC &&
+           dev->device == PCI_DEVICE_ID_UMC_UM8886A &&
            (!(PCI_FUNC(dev->devfn) & 1)))
                return 1; /* UM8886A/BF pair */
 
-       if ((d->vendor == PCI_VENDOR_ID_OPTI) &&
-           (d->device == PCI_DEVICE_ID_OPTI_82C558) &&
+       if (dev->vendor == PCI_VENDOR_ID_OPTI &&
+           dev->device == PCI_DEVICE_ID_OPTI_82C558 &&
            (!(PCI_FUNC(dev->devfn) & 1)))
                return 1;
 
@@ -131,7 +127,9 @@ static struct pci_device_id generic_pci_tbl[] = {
        { PCI_VENDOR_ID_HINT,   PCI_DEVICE_ID_HINT_VXPROII_IDE,    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6},
        { PCI_VENDOR_ID_VIA,    PCI_DEVICE_ID_VIA_82C561,          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7},
        { PCI_VENDOR_ID_OPTI,   PCI_DEVICE_ID_OPTI_82C558,         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8},
+#ifdef CONFIG_BLK_DEV_IDE_SATA
        { PCI_VENDOR_ID_VIA,    PCI_DEVICE_ID_VIA_8237_SATA,       PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9},
+#endif
        { PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO,     PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10},
        { PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11},
        { PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12},
@@ -140,7 +138,7 @@ static struct pci_device_id generic_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, generic_pci_tbl);
 
 static struct pci_driver driver = {
-       .name           = "PCI IDE",
+       .name           = "PCI_IDE",
        .id_table       = generic_pci_tbl,
        .probe          = generic_init_one,
 };