upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 934df27..df9ee9a 100644 (file)
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -321,22 +321,6 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
 
 static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
        {       /* 0 */
-               .name           = "ATIIXP",
-               .init_hwif      = init_hwif_atiixp,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
-               .bootable       = ON_BOARD,
-       },
-       {       /* 1 */
-               .name           = "ATIIXP",
-               .init_hwif      = init_hwif_atiixp,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
-               .bootable       = ON_BOARD,
-       },
-       {       /* 2 */
                .name           = "ATIIXP",
                .init_hwif      = init_hwif_atiixp,
                .channels       = 2,
@@ -357,14 +341,13 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
 
 static int __devinit atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-       ide_setup_pci_device(dev, &atiixp_pci_info[id->driver_data]);
-       return 0;
+       return ide_setup_pci_device(dev, &atiixp_pci_info[id->driver_data]);
 }
 
 static struct pci_device_id atiixp_pci_tbl[] = {
        { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP200_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-       { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
-       { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
+       { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
 };
 MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);