patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / ide / pci / pdc202xx_new.h

diff --git a/drivers/ide/pci/pdc202xx_new.h b/drivers/ide/pci/pdc202xx_new.h
index e33c0d0..0abec0e 100644 (file)
--- a/drivers/ide/pci/pdc202xx_new.h
+++ b/drivers/ide/pci/pdc202xx_new.h
@@ -53,109 +53,67 @@ static void init_hwif_pdc202new(ide_hwif_t *);
 
 static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20268,
                .name           = "PDC20268",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20269,
                .name           = "PDC20269",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20270,
                .name           = "PDC20270",
                .init_setup     = init_setup_pdc20270,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20271,
                .name           = "PDC20271",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 4 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20275,
                .name           = "PDC20275",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 5 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20276,
                .name           = "PDC20276",
                .init_setup     = init_setup_pdc20276,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-#ifdef CONFIG_PDC202XX_FORCE
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-#else /* !CONFIG_PDC202XX_FORCE */
+#ifndef CONFIG_PDC202XX_FORCE
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
 #endif
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 6 */
-               .vendor         = PCI_VENDOR_ID_PROMISE,
-               .device         = PCI_DEVICE_ID_PROMISE_20277,
                .name           = "PDC20277",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_pdc202new,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };