Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933713Ab0BEC5t (ORCPT ); Thu, 4 Feb 2010 21:57:49 -0500 Received: from p01c11o144.mxlogic.net ([208.65.144.67]:53442 "EHLO p01c11o144.mxlogic.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933238Ab0BEC5s convert rfc822-to-8bit (ORCPT ); Thu, 4 Feb 2010 21:57:48 -0500 X-MXL-Hash: 4b6b892b1a12cec9-b6bd14a9fca0d52715f12a12577f1446d033f118 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT Subject: RE: [PATCH 2.6.33 4/4] net: Add PCI vendor and device ids for Micrel KSZ8841/2 PCI devices Date: Thu, 4 Feb 2010 18:55:31 -0800 Message-ID: <14385191E87B904DBD836449AA30269D5CC333@MORGANITE.micrel.com> In-Reply-To: <20100204154004.44e3d607@nehalam> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH 2.6.33 4/4] net: Add PCI vendor and device ids for Micrel KSZ8841/2 PCI devices Thread-Index: Acql825zZ1z3nuDoSo2jYlm0xWlheQAGfQkg References: <14385191E87B904DBD836449AA30269D021A55@MORGANITE.micrel.com> <20100204154004.44e3d607@nehalam> From: "Ha, Tristram" To: "Stephen Hemminger" Cc: "Dave Miller" , , X-OriginalArrivalTime: 05 Feb 2010 02:57:45.0996 (UTC) FILETIME=[FE5114C0:01CAA60E] X-Spam: [F=0.2000000000; CM=0.500; S=0.200(2010011101)] X-MAIL-FROM: X-SOURCE-IP: [65.218.208.2] X-AnalysisOut: [v=1.0 c=1 a=wV2cvNrAZT0A:10 a=J3BOMSfJb05aRia9DmE+FQ==:17 ] X-AnalysisOut: [a=Q4n7fi2PAAAA:8 a=8N_FcyAvCEghzb4Lv_AA:9 a=0dR30kB0MSXF2b] X-AnalysisOut: [m6Ao7SuDkSgEkA:4 a=yJsD6ztlz_8A:10] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1805 Lines: 53 Stephen Hemminger wrote: > On Thu, 4 Feb 2010 15:28:29 -0800 > "Ha, Tristram" wrote: > >> From: Tristram Ha >> >> Add PCI vendor and device ids for Micrel KSZ8841/2 PCI devices. >> >> Signed-off-by: Tristram Ha --- >> This is a resubmission of the Micrel KSZ8841/2 PCI Ethernet driver. >> >> --- linux-2.6.33-rc5.old/include/linux/pci_ids.h 2010-01-21 15:31:35.000000000 -0800 >> +++ linux-2.6.33-rc5.new/include/linux/pci_ids.h 2010-01-29 10:38:53.000000000 -0800 @@ -2199,6 >> +2199,12 @@ #define PCI_VENDOR_ID_NETCELL 0x169c >> #define PCI_DEVICE_ID_REVOLUTION 0x0044 >> >> +#define PCI_VENDOR_ID_MICREL_KS 0x16c6 >> +#define PCI_DEVICE_ID_MICREL_KS8692 0x8692 >> +#define PCI_DEVICE_ID_MICREL_KS8695 0x8695 >> +#define PCI_DEVICE_ID_MICREL_KS8841 0x8841 >> +#define PCI_DEVICE_ID_MICREL_KS8842 0x8842 >> + >> #define PCI_VENDOR_ID_CENATEK 0x16CA >> #define PCI_DEVICE_ID_CENATEK_IDE 0x0001 >> > > Current practice is to NOT update this file and instead keep constants in the individual driver. It seems I received conflicted recommendation from Alan Cox: >> >> +#define PCI_VENDOR_ID_KS884X 0x16C6 >> >> +#define PCI_DEVICE_ID_KS8841 0x8841 >> >> +#define PCI_DEVICE_ID_KS8842 0x8842 >> > >> > Those belong in the pci device id header. >> > >> > >> >> I do not quite understand your suggestion. Do I need to put those IDs >> in one of the kernel headers? > > Into include/linux/pci_ids.h So I do not need to update pci_ids.h with even the PCI vendor ID? -- 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/