patch-2_6_7-vs1_9_1_12

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

diff --git a/drivers/ide/pci/serverworks.h b/drivers/ide/pci/serverworks.h
index eba6e0b..aa8bd8b 100644 (file)
--- a/drivers/ide/pci/serverworks.h
+++ b/drivers/ide/pci/serverworks.h
@@ -31,66 +31,40 @@ static void init_dma_svwks(ide_hwif_t *, unsigned long);
 
 static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_SERVERWORKS,
-               .device         = PCI_DEVICE_ID_SERVERWORKS_OSB4IDE,
                .name           = "SvrWks OSB4",
                .init_setup     = init_setup_svwks,
                .init_chipset   = init_chipset_svwks,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_svwks,
-               .init_dma       = NULL,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_SERVERWORKS,
-               .device         = PCI_DEVICE_ID_SERVERWORKS_CSB5IDE,
                .name           = "SvrWks CSB5",
                .init_setup     = init_setup_svwks,
                .init_chipset   = init_chipset_svwks,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_svwks,
                .init_dma       = init_dma_svwks,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_SERVERWORKS,
-               .device         = PCI_DEVICE_ID_SERVERWORKS_CSB6IDE,
                .name           = "SvrWks CSB6",
                .init_setup     = init_setup_csb6,
                .init_chipset   = init_chipset_svwks,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_svwks,
                .init_dma       = init_dma_svwks,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
        },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_SERVERWORKS,
-               .device         = PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2,
                .name           = "SvrWks CSB6",
                .init_setup     = init_setup_csb6,
                .init_chipset   = init_chipset_svwks,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_svwks,
                .init_dma       = init_dma_svwks,
                .channels       = 1,    /* 2 */
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = ON_BOARD,
-               .extra          = 0,
-       },{
-               .vendor         = 0,
-               .device         = 0,
-               .channels       = 0,
-               .bootable       = EOL,
        }
 };