From patchwork Mon Feb 8 21:38:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ha, Tristram" X-Patchwork-Id: 44862 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 74648B7CF6 for ; Tue, 9 Feb 2010 08:39:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751891Ab0BHVjg (ORCPT ); Mon, 8 Feb 2010 16:39:36 -0500 Received: from p01c12o142.mxlogic.net ([208.65.145.65]:35908 "EHLO p01c12o142.mxlogic.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751507Ab0BHVje convert rfc822-to-8bit (ORCPT ); Mon, 8 Feb 2010 16:39:34 -0500 Received: from unknown [65.218.208.2] by p01c12o142.mxlogic.net(mxl_mta-6.5.0-0) with SMTP id 594807b4.0.28823.00-024.72308.p01c12o142.mxlogic.net (envelope-from ); Mon, 08 Feb 2010 14:39:34 -0700 (MST) X-MXL-Hash: 4b7084964e09412a-746b98cc6e71632279300b4e0c2730be970c1dae Received: from MORGANITE.micrel.com ([10.25.1.82]) by Peridot.micrel.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 8 Feb 2010 13:38:28 -0800 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Subject: [PATCH 2.6.33 2/3] net: Kconfig change for KSZ884X driver Date: Mon, 8 Feb 2010 13:38:28 -0800 Message-ID: <14385191E87B904DBD836449AA30269D021A57@MORGANITE.micrel.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH 2.6.33 2/3] net: Kconfig change for KSZ884X driver Thread-Index: AcqpBw1WCT48sCfGTiuCpVs+2mq4uw== From: "Ha, Tristram" To: "Dave Miller" Cc: , X-OriginalArrivalTime: 08 Feb 2010 21:38:28.0942 (UTC) FILETIME=[0D799EE0:01CAA907] 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=3gXMHnU96PoA:10 a=J3BOMSfJb05aRia9DmE+FQ==:17 ] X-AnalysisOut: [a=Q4n7fi2PAAAA:8 a=gpeGt47jHdT7ORR_t74A:9 a=VootWrtJUJbc0V] X-AnalysisOut: [vtmLYCbRM12lAA:4 a=yJsD6ztlz_8A:10] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tristram Ha Add Micrel KSZ8841/KSZ8842 PCI Ethernet chip support. Signed-off-by: Tristram Ha --- This is a resubmission of the Micrel KSZ8841/2 PCI Ethernet driver. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-2.6.33-rc5.old/drivers/net/Kconfig 2010-01-21 15:31:35.000000000 -0800 +++ linux-2.6.33-rc5.new/drivers/net/Kconfig 2010-02-04 12:12:58.000000000 -0800 @@ -1368,6 +1368,17 @@ config AC3200 To compile this driver as a module, choose M here. The module will be called ac3200. +config KSZ884X_PCI + tristate "Micrel KSZ8841/2 PCI" + depends on NET_PCI && PCI + select MII + select CRC32 + help + This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip. + + To compile this driver as a module, choose M here. The module + will be called ksz884x. + config APRICOT tristate "Apricot Xen-II on board Ethernet" depends on NET_PCI && ISA