2005-11-24 01:40:38

by Grant Coady

[permalink] [raw]
Subject: [PATCH] pci_ids.h: remove duplicate entries

G'day Albert, Andrew,

commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7
Author: Albert Lee <[email protected]>
Date: Thu May 12 15:49:21 2005 -0400

duplicates symbols already appearing in pci_ids.h, appended patch
removes them again :o)

Cheers,
Grant.

From: Grant Coady <[email protected]>

pci_ids: commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7 duplicated a
couple existing symbols in pci_ids.h, remove them.

Signed-off-by: Grant Coady <[email protected]>

---
pci_ids.h | 3 ---
1 files changed, 3 deletions(-)

--- linux-2.6.15-rc2-mm1a/include/linux/pci_ids.h~ 2005-11-24 07:51:24.000000000 +1100
+++ linux-2.6.15-rc2-mm1a/include/linux/pci_ids.h 2005-11-24 12:27:58.000000000 +1100
@@ -391,7 +391,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
@@ -501,8 +500,6 @@
#define PCI_DEVICE_ID_AMD_CS5536_UOC 0x2097
#define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A

-#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