From b29464bf88e22c4cfb7dab1140583c0b16061f09 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 25 Jan 2007 16:15:24 -0800 Subject: [PATCH] --- yaml --- r: 46731 b: refs/heads/master c: b11056355ea149c37edf0ef54976a49f5258cd54 h: refs/heads/master i: 46729: 2379495ed57a6ab82f8a70059dd233dcca169232 46727: 2f86707e5583e18f83356c2fa47466dedc61124a v: v3 --- [refs] | 2 +- trunk/drivers/ata/ata_piix.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 85574f120acf..c15730cd1677 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e36c455c2f5fee08fed395e94c7ab156cd159360 +refs/heads/master: b11056355ea149c37edf0ef54976a49f5258cd54 diff --git a/trunk/drivers/ata/ata_piix.c b/trunk/drivers/ata/ata_piix.c index 47701b286f8b..267241a59080 100644 --- a/trunk/drivers/ata/ata_piix.c +++ b/trunk/drivers/ata/ata_piix.c @@ -191,12 +191,8 @@ static const struct pci_device_id piix_pci_tbl[] = { /* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */ { 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, { 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - /* Intel ICH5 */ - { 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 }, /* C-ICH (i810E2) */ { 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, - /* ESB (855GME/875P + 6300ESB) UDMA 100 */ - { 0x8086, 0x25A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, /* ICH6 (and 6) (i915) UDMA 100 */ { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, /* ICH7/7-R (i945, i975) UDMA 100*/