vserver 1.9.3

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

diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 8a6c316..ab76641 100644 (file)
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -355,10 +355,7 @@ static void __init init_setup_opti621 (struct pci_dev *dev, ide_pci_device_t *d)
 
 static int __devinit opti621_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_pci_device_t *d = &opti621_chipsets[id->driver_data];
-       if (dev->device != d->device)
-               BUG();
-       ide_setup_pci_device(dev, d);
+       ide_setup_pci_device(dev, &opti621_chipsets[id->driver_data]);
        return 0;
 }
 
@@ -370,7 +367,7 @@ static struct pci_device_id opti621_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, opti621_pci_tbl);
 
 static struct pci_driver driver = {
-       .name           = "Opti621 IDE",
+       .name           = "Opti621_IDE",
        .id_table       = opti621_pci_tbl,
        .probe          = opti621_init_one,
 };