[PATCH] pci_ids.h: remove duplicate entries

From: Greg KH (gregkh_at_suse.de)
Date: 11/30/05

  • Next message: Greg KH: "[PATCH] USB: Fix USB suspend/resume crasher (#2)"
    Date:	Tue, 29 Nov 2005 21:58:37 -0800
    To: linux-kernel@vger.kernel.org, linux-usb-devel@lists.sourceforge.net
    
    

    [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
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at  http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at  http://www.tux.org/lkml/
    

  • Next message: Greg KH: "[PATCH] USB: Fix USB suspend/resume crasher (#2)"

    Relevant Pages

    • Re: problem with duplicate sysfs directories and files
      ... I could verify the following patch using this. ... don't see the duplicate "gregkh1" directories. ... Subject: sysfs: fix problem with duplicate sysfs directories and files ...
      (Linux-Kernel)
    • Re: problem with duplicate sysfs directories and files
      ... I could verify the following patch using this. ... don't see the duplicate "gregkh1" directories. ... void * element, umode_t mode, int type) ...
      (Linux-Kernel)
    • Re: [S] [Patch] Duplicate Slashem
      ... but I've not started to port L's ... Tonight's special treat is a port of jimrandomh's duplicate patch. ... MS-DOS games, including the ability to play duplicate games. ...
      (rec.games.roguelike.nethack)
    • Re: Hoax Exploit
      ... > above message is unknown in nature. ... We suspect that the "patch" released in ... can't duplicate the remote code execution but the IMail Web Service (v. ...
      (Bugtraq)
    • Re: [PATCH] remove duplicate #includes
      ... the amount of duplicate includes in the kernel ... ... So please exclude this part from your patch so as to avoid collisions. ... That's one of the advantages of having everyone's development trees ... okay, after Arthurs input regarding the script, I'll ...
      (Linux-Kernel)