From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, linux-usb-devel@lists.sourceforge.net
Cc: grant_lkml@dodo.com.au
Subject: [PATCH] pci_ids.h: remove duplicate entries
Date: Tue, 29 Nov 2005 21:58:37 -0800 [thread overview]
Message-ID: <11333303172787@kroah.com> (raw)
In-Reply-To: <11333303173652@kroah.com>
[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>
---
commit c9d6073fb3cda856132dd544d537679f9715436c
tree ad9bc2f500c71a6ff5012e62bdd3439760b9d829
parent 9632051963cb6e6f7412990f8b962209b9334e13
author Grant Coady <grant_lkml@dodo.com.au> Thu, 24 Nov 2005 20:41:06 +1100
committer Greg Kroah-Hartman <gregkh@suse.de> Tue, 29 Nov 2005 21:39:22 -0800
include/linux/pci_ids.h | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 1e737e2..53e3293 100644
--- a/include/linux/pci_ids.h
+++ b/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
next prev parent reply other threads:[~2005-11-30 5:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-30 5:56 [GIT PATCH] USB patches for 2.6.15-rc3 Greg KH
2005-11-30 5:58 ` [PATCH] USB: documentation update Greg KH
2005-11-30 5:58 ` [PATCH] hwmon: w83792d fix unused fan pins Greg KH
2005-11-30 5:58 ` Greg KH [this message]
2005-11-30 5:58 ` [PATCH] Additional device ID for Conexant AccessRunner USB driver Greg KH
2005-11-30 5:58 ` [PATCH] USB: ehci fixups Greg KH
2005-11-30 5:58 ` [PATCH] USB: Fix USB suspend/resume crasher (#2) Greg KH
2005-11-30 8:09 ` [linux-usb-devel] [PATCH] Additional device ID for Conexant AccessRunner USB driver Duncan Sands
2005-11-30 22:30 ` Greg KH
2005-12-01 7:50 ` Duncan Sands
2005-11-30 18:23 ` [GIT PATCH] USB patches for 2.6.15-rc3 Linus Torvalds
2005-11-30 19:35 ` Greg KH
2005-11-30 20:35 ` Grant Coady
2005-12-01 4:10 ` (no subject) Glenn L Shurson
2005-11-30 19:39 ` [GIT PATCH] USB patches for 2.6.15-rc3 Jean Delvare
-- strict thread matches above, loose matches on Subject: below --
2005-11-24 1:40 [PATCH] pci_ids.h: remove duplicate entries Grant Coady
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11333303172787@kroah.com \
--to=gregkh@suse.de \
--cc=grant_lkml@dodo.com.au \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).