diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-30 23:38:05 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-30 23:38:05 -0800 |
| commit | ba7b60dbf1b49c0777e2ac9b7305ae95d7e24c5d (patch) | |
| tree | 9c3f187f30b606d9eb240d38248be25b924e840a /pci | |
| parent | f72486aeeb282ba3eabd5ddb686bc18243e0f8a0 (diff) | |
| download | patches-ba7b60dbf1b49c0777e2ac9b7305ae95d7e24c5d.tar.gz | |
2.6.15-rc4 sync
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/pci_ids.h-remove-duplicate-entries.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/pci/pci_ids.h-remove-duplicate-entries.patch b/pci/pci_ids.h-remove-duplicate-entries.patch deleted file mode 100644 index c6acb756e1b6c..0000000000000 --- a/pci/pci_ids.h-remove-duplicate-entries.patch +++ /dev/null @@ -1,48 +0,0 @@ -From grant_lkml@dodo.com.au Thu Nov 24 01:44:55 2005 -From: Grant Coady <grant_lkml@dodo.com.au> -To: Greg KH <greg@kroah.com> -Subject: [PATCH] pci_ids.h: remove duplicate entries -Date: Thu, 24 Nov 2005 20:41:06 +1100 -Message-ID: <sg2bo1pqd5v12ia23dqd86grrmg7mv989l@4ax.com> - - -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> - ---- - include/linux/pci_ids.h | 3 --- - 1 file changed, 3 deletions(-) - ---- gregkh-2.6.orig/include/linux/pci_ids.h -+++ gregkh-2.6/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 |