2006-01-15 05:22:36

by Grant Coady

[permalink] [raw]
Subject: [PATCH] pci_ids: remove duplicates gathered during merge period


From: Grant Coady <[email protected]>

pci_ids.h: remove duplicates. Compile tested allmodconfig.

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

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

--- linux-2.6.15-git10a/include/linux/pci_ids.h 2006-01-15 09:01:39.000000000 +1100
+++ linux-2.6.15-git10b/include/linux/pci_ids.h 2006-01-15 11:30:56.000000000 +1100
@@ -393,14 +393,9 @@
#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_DEVICE_ID_NS_CS5535_HOST_BRIDGE 0x0028
#define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE 0x002b
-#define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d
-#define PCI_DEVICE_ID_NS_CS5535_AUDIO 0x002e
-#define PCI_DEVICE_ID_NS_CS5535_USB 0x002f
-#define PCI_DEVICE_ID_NS_CS5535_VIDEO 0x0030

#define PCI_VENDOR_ID_TSENG 0x100c
#define PCI_DEVICE_ID_TSENG_W32P_2 0x3202
@@ -510,8 +505,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_DEVICE_ID_AMD_LX_VIDEO 0x2081
#define PCI_DEVICE_ID_AMD_LX_AES 0x2082