Cset exclude: davej@redhat.com|ChangeSet|20040523113850|65135

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 9890c24cee7cfe0533c42a93265be2f8921aebcb..bbf8f3e0476282973da4fc1221d827db3476d485 100644 (file)
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -1491,8 +1491,7 @@ static struct pci_device_id agp_intel_pci_table[] = {
        ID(PCI_DEVICE_ID_INTEL_82865_HB),
        ID(PCI_DEVICE_ID_INTEL_82875_HB),
        ID(PCI_DEVICE_ID_INTEL_7505_0),
-       ID(PCI_DEVICE_ID_INTEL_7501_0),
-       ID(PCI_DEVICE_ID_INTEL_7205_0),
+       ID(PCI_DEVICE_ID_INTEL_7205_0), 
        { }
 };
 

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 0460426ef25fc610f1bc751570218ae679504a5b..0a4637995937f325ab6a61387ed90228554fcc8a 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1958,7 +1958,6 @@
 #define PCI_DEVICE_ID_INTEL_82092AA_0  0x1221
 #define PCI_DEVICE_ID_INTEL_82092AA_1  0x1222
 #define PCI_DEVICE_ID_INTEL_7116       0x1223
-#define PCI_DEVICE_ID_INTEL_7501_0     0x254c
 #define PCI_DEVICE_ID_INTEL_7505_0     0x2550  
 #define PCI_DEVICE_ID_INTEL_7505_1     0x2552  
 #define PCI_DEVICE_ID_INTEL_7205_0     0x255d