diff options
author | Grant Coady <grant_lkml@dodo.com.au> | 2005-11-24 04:41:06 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-30 00:39:22 -0500 |
commit | c9d6073fb3cda856132dd544d537679f9715436c (patch) | |
tree | ad9bc2f500c71a6ff5012e62bdd3439760b9d829 | |
parent | 9632051963cb6e6f7412990f8b962209b9334e13 (diff) |
[PATCH] pci_ids.h: remove duplicate entries
G'day Albert, Andrew,
commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7
Author: Albert Lee <albertcc@tw.ibm.com>
Date: Thu May 12 15:49:21 2005 -0400
duplicates symbols already appearing in pci_ids.h, appended patch
removes them again :o)
From: Grant Coady <gcoady@gmail.com>
pci_ids: commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7 duplicated a
couple existing symbols in pci_ids.h, remove them.
Signed-off-by: Grant Coady <gcoady@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | include/linux/pci_ids.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 1e737e269db9..53e3293051d4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -387,7 +387,6 @@ | |||
387 | #define PCI_DEVICE_ID_NS_SC1100_SMI 0x0511 | 387 | #define PCI_DEVICE_ID_NS_SC1100_SMI 0x0511 |
388 | #define PCI_DEVICE_ID_NS_SC1100_XBUS 0x0515 | 388 | #define PCI_DEVICE_ID_NS_SC1100_XBUS 0x0515 |
389 | #define PCI_DEVICE_ID_NS_87410 0xd001 | 389 | #define PCI_DEVICE_ID_NS_87410 0xd001 |
390 | #define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d | ||
391 | 390 | ||
392 | #define PCI_VENDOR_ID_TSENG 0x100c | 391 | #define PCI_VENDOR_ID_TSENG 0x100c |
393 | #define PCI_DEVICE_ID_TSENG_W32P_2 0x3202 | 392 | #define PCI_DEVICE_ID_TSENG_W32P_2 0x3202 |
@@ -489,8 +488,6 @@ | |||
489 | #define PCI_DEVICE_ID_AMD_8151_0 0x7454 | 488 | #define PCI_DEVICE_ID_AMD_8151_0 0x7454 |
490 | #define PCI_DEVICE_ID_AMD_8131_APIC 0x7450 | 489 | #define PCI_DEVICE_ID_AMD_8131_APIC 0x7450 |
491 | 490 | ||
492 | #define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A | ||
493 | |||
494 | #define PCI_VENDOR_ID_TRIDENT 0x1023 | 491 | #define PCI_VENDOR_ID_TRIDENT 0x1023 |
495 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 | 492 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 |
496 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001 | 493 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001 |