diff options
| author | Grant Coady <grant_lkml@dodo.com.au> | 2005-11-24 20:41:06 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-29 21:39:22 -0800 |
| commit | c9d6073fb3cda856132dd544d537679f9715436c (patch) | |
| tree | ad9bc2f500c71a6ff5012e62bdd3439760b9d829 /include | |
| parent | 9632051963cb6e6f7412990f8b962209b9334e13 (diff) | |
| download | op-kernel-dev-c9d6073fb3cda856132dd544d537679f9715436c.zip op-kernel-dev-c9d6073fb3cda856132dd544d537679f9715436c.tar.gz | |
[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>
Diffstat (limited to 'include')
| -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 1e737e2..53e3293 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -387,7 +387,6 @@ #define PCI_DEVICE_ID_NS_SC1100_SMI 0x0511 #define PCI_DEVICE_ID_NS_SC1100_XBUS 0x0515 #define PCI_DEVICE_ID_NS_87410 0xd001 -#define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d #define PCI_VENDOR_ID_TSENG 0x100c #define PCI_DEVICE_ID_TSENG_W32P_2 0x3202 @@ -489,8 +488,6 @@ #define PCI_DEVICE_ID_AMD_8151_0 0x7454 #define PCI_DEVICE_ID_AMD_8131_APIC 0x7450 -#define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A - #define PCI_VENDOR_ID_TRIDENT 0x1023 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001 |
