From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932447AbVLUPQb (ORCPT ); Wed, 21 Dec 2005 10:16:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932450AbVLUPQb (ORCPT ); Wed, 21 Dec 2005 10:16:31 -0500 Received: from ns1.suse.de ([195.135.220.2]:60609 "EHLO mx1.suse.de") by vger.kernel.org with ESMTP id S932447AbVLUPQa (ORCPT ); Wed, 21 Dec 2005 10:16:30 -0500 Date: Wed, 21 Dec 2005 16:19:41 +0100 Message-ID: From: Takashi Iwai To: Andrew Morton Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2.6.15-rc5-mm3] Remove duplicated PCI id User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta21) (corn) (+CVS-20050720) (i386-suse-linux) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org The patch removes the duplicated PCI ID entry in pci_ids.h. Signed-off-by: Takashi Iwai --- pci_ids.h | 2 -- 1 files changed, 2 deletions(-) --- linux-2.6.15-rc5/include/linux/pci_ids.h 2005-12-21 15:58:57.000000000 +0100 +++ linux-2.6.15-rc5/include/linux/pci_ids.h 2005-12-21 15:59:13.000000000 +0100 @@ -502,8 +502,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_VENDOR_ID_TRIDENT 0x1023 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001