Merge to Fedora kernel-2.6.6-1.422

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

diff --git a/drivers/ide/pci/generic.h b/drivers/ide/pci/generic.h
index fdaaf21..a666920 100644 (file)
--- a/drivers/ide/pci/generic.h
+++ b/drivers/ide/pci/generic.h
@@ -10,8 +10,6 @@ static void init_hwif_generic(ide_hwif_t *);
 
 static ide_pci_device_t generic_chipsets[] __devinitdata = {
        {       /* 0 */
-               .vendor         = PCI_VENDOR_ID_NS,
-               .device         = PCI_DEVICE_ID_NS_87410,
                .name           = "NS87410",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -20,8 +18,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .enablebits     = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
                .bootable       = ON_BOARD,
         },{    /* 1 */
-               .vendor         = PCI_VENDOR_ID_PCTECH,
-               .device         = PCI_DEVICE_ID_PCTECH_SAMURAI_IDE,
                .name           = "SAMURAI",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -29,8 +25,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 2 */
-               .vendor         = PCI_VENDOR_ID_HOLTEK,
-               .device         = PCI_DEVICE_ID_HOLTEK_6565,
                .name           = "HT6565",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -38,8 +32,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 3 */
-               .vendor         = PCI_VENDOR_ID_UMC,
-               .device         = PCI_DEVICE_ID_UMC_UM8673F,
                .name           = "UM8673F",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -47,8 +39,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NODMA,
                .bootable       = ON_BOARD,
        },{     /* 4 */
-               .vendor         = PCI_VENDOR_ID_UMC,
-               .device         = PCI_DEVICE_ID_UMC_UM8886A,
                .name           = "UM8886A",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -56,8 +46,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NODMA,
                .bootable       = ON_BOARD,
        },{     /* 5 */
-               .vendor         = PCI_VENDOR_ID_UMC,
-               .device         = PCI_DEVICE_ID_UMC_UM8886BF,
                .name           = "UM8886BF",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -65,8 +53,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NODMA,
                .bootable       = ON_BOARD,
        },{     /* 6 */
-               .vendor         = PCI_VENDOR_ID_HINT,
-               .device         = PCI_DEVICE_ID_HINT_VXPROII_IDE,
                .name           = "HINT_IDE",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -74,8 +60,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 7 */
-               .vendor         = PCI_VENDOR_ID_VIA,
-               .device         = PCI_DEVICE_ID_VIA_82C561,
                .name           = "VIA_IDE",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -83,8 +67,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NOAUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 8 */
-               .vendor         = PCI_VENDOR_ID_OPTI,
-               .device         = PCI_DEVICE_ID_OPTI_82C558,
                .name           = "OPTI621V",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -92,8 +74,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NOAUTODMA,
                .bootable       = ON_BOARD,
        },{     /* 9 */
-               .vendor         = PCI_VENDOR_ID_VIA,
-               .device         = PCI_DEVICE_ID_VIA_8237_SATA,
                .name           = "VIA8237SATA",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -101,8 +81,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .bootable       = OFF_BOARD,
        },{ /* 10 */
-               .vendor         = PCI_VENDOR_ID_TOSHIBA,
-               .device         = PCI_DEVICE_ID_TOSHIBA_PICCOLO,
                .name           = "Piccolo0102",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -110,8 +88,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NOAUTODMA,
                .bootable       = ON_BOARD,
        },{ /* 11 */
-               .vendor         = PCI_VENDOR_ID_TOSHIBA,
-               .device         = PCI_DEVICE_ID_TOSHIBA_PICCOLO_1,
                .name           = "Piccolo0103",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -119,8 +95,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                .autodma        = NOAUTODMA,
                .bootable       = ON_BOARD,
        },{ /* 12 */
-               .vendor         = PCI_VENDOR_ID_TOSHIBA,
-               .device         = PCI_DEVICE_ID_TOSHIBA_PICCOLO_2,
                .name           = "Piccolo0105",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,
@@ -133,8 +107,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
 #if 0
 static ide_pci_device_t unknown_chipset[] __devinitdata = {
        {       /* 0 */
-               .vendor         = 0,
-               .device         = 0,
                .name           = "PCI_IDE",
                .init_chipset   = init_chipset_generic,
                .init_hwif      = init_hwif_generic,