Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/drivers/ide/pci/aec62xx.h b/drivers/ide/pci/aec62xx.h
index c414548..460d7e3 100644 (file)
--- a/drivers/ide/pci/aec62xx.h
+++ b/drivers/ide/pci/aec62xx.h
@@ -53,13 +53,6 @@ struct chipset_bus_clock_list_entry aec6xxx_34_base [] = {
        {       0,              0x00,   0x00    }
 };
 
-
-#ifndef HIGH_4
-#define HIGH_4(H)              ((H)=(H>>4))
-#endif
-#ifndef LOW_4
-#define LOW_4(L)               ((L)=(L-((L>>4)<<4)))
-#endif
 #ifndef SPLIT_BYTE
 #define SPLIT_BYTE(B,H,L)      ((H)=(B>>4), (L)=(B-((B>>4)<<4)))
 #endif
@@ -78,75 +71,53 @@ static void init_dma_aec62xx(ide_hwif_t *, unsigned long);
 
 static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_ARTOP,
-               .device         = PCI_DEVICE_ID_ARTOP_ATP850UF,
                .name           = "AEC6210",
                .init_setup     = init_setup_aec62xx,
                .init_chipset   = init_chipset_aec62xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_aec62xx,
                .init_dma       = init_dma_aec62xx,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 1 */
-               .vendor         = PCI_VENDOR_ID_ARTOP,
-               .device         = PCI_DEVICE_ID_ARTOP_ATP860,
                .name           = "AEC6260",
                .init_setup     = init_setup_aec62xx,
                .init_chipset   = init_chipset_aec62xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_aec62xx,
                .init_dma       = init_dma_aec62xx,
                .channels       = 2,
                .autodma        = NOAUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_ARTOP,
-               .device         = PCI_DEVICE_ID_ARTOP_ATP860R,
                .name           = "AEC6260R",
                .init_setup     = init_setup_aec62xx,
                .init_chipset   = init_chipset_aec62xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_aec62xx,
                .init_dma       = init_dma_aec62xx,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                .bootable       = NEVER_BOARD,
-               .extra          = 0,
        },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_ARTOP,
-               .device         = PCI_DEVICE_ID_ARTOP_ATP865,
                .name           = "AEC6X80",
                .init_setup     = init_setup_aec6x80,
                .init_chipset   = init_chipset_aec62xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_aec62xx,
                .init_dma       = init_dma_aec62xx,
                .channels       = 2,
                .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        },{     /* 4 */
-               .vendor         = PCI_VENDOR_ID_ARTOP,
-               .device         = PCI_DEVICE_ID_ARTOP_ATP865R,
                .name           = "AEC6X80R",
                .init_setup     = init_setup_aec6x80,
                .init_chipset   = init_chipset_aec62xx,
-               .init_iops      = NULL,
                .init_hwif      = init_hwif_aec62xx,
                .init_dma       = init_dma_aec62xx,
                .channels       = 2,
                .autodma        = AUTODMA,
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                .bootable       = OFF_BOARD,
-               .extra          = 0,
        }
 };