Merge to Fedora kernel-2.6.6-1.422

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

diff --git a/drivers/ide/pci/cs5520.h b/drivers/ide/pci/cs5520.h
index 3395306..f2cdc53 100644 (file)
--- a/drivers/ide/pci/cs5520.h
+++ b/drivers/ide/pci/cs5520.h
@@ -13,28 +13,24 @@ static void cs5520_init_setup_dma(struct pci_dev *dev, struct ide_pci_device_s *
 
 static ide_pci_device_t cyrix_chipsets[] __devinitdata = {
        {
-               .vendor         = PCI_VENDOR_ID_CYRIX,
-               .device         = PCI_DEVICE_ID_CYRIX_5510,
                .name           = "Cyrix 5510",
                .init_chipset   = init_chipset_cs5520,
                .init_setup_dma = cs5520_init_setup_dma,
                .init_hwif      = init_hwif_cs5520,
-               .isa_ports      = 1,
                .channels       = 2,
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
+               .flags          = IDEPCI_FLAG_ISA_PORTS,
        },
        {
-               .vendor         = PCI_VENDOR_ID_CYRIX,
-               .device         = PCI_DEVICE_ID_CYRIX_5520,
                .name           = "Cyrix 5520",
                .init_chipset   = init_chipset_cs5520,
                .init_setup_dma = cs5520_init_setup_dma,
                .init_hwif      = init_hwif_cs5520,
-               .isa_ports      = 1,
                .channels       = 2,
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
+               .flags          = IDEPCI_FLAG_ISA_PORTS,
        }
 };