Commit c9d6073f authored Nov 24, 2005 by Grant Coady Committed by Greg Kroah-Hartman Nov 29, 2005

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

parent 96320519

include/linux/pci_ids.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -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

Admin message