[PATCH] PCI: pci_ids: remove duplicates gathered during merge period

[PATCH] PCI: pci_ids: remove duplicates gathered during merge period

pci_ids.h: remove duplicates.  Compile tested allmodconfig.

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

---
commit 6404e7c38021e2e9bed564ee3ede2afe43611c3b
tree 44e17a37e7d0648a39d9a7319d1f563ed1a1b2e5
parent 9b88de850747ab8ff39ce31ca6ff788210f9441a
author Grant Coady <[email protected]> Sun, 15 Jan 2006 16:21:27 +1100
committer Greg Kroah-Hartman <[email protected]> Fri, 20 Jan 2006 10:29:34 -0800

 include/linux/pci_ids.h |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 560b26a..ab8593a 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -394,14 +394,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
@@ -511,8 +506,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
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

---

• Follow-Ups:
  • [PATCH] PCI: make it easier to see that set_msi_affinity() is used
    • From: Greg KH <[email protected]>

• References:
  • [PATCH] PCI Hotplug: fix up coding style issues
    • From: Greg KH <[email protected]>

• Prev by Date: [PATCH] powerpc/PCI hotplug: remove rpaphp_fixup_new_pci_devices()
• Next by Date: [PATCH] powerpc/PCI hotplug: remove remove_bus_device()
• Previous by thread: [PATCH] PCI Hotplug: fix up coding style issues
• Next by thread: [PATCH] PCI: make it easier to see that set_msi_affinity() is used
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]