From patchwork Thu Feb 4 23:26:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ha, Tristram" X-Patchwork-Id: 44563 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 7B2DCB7D60 for ; Fri, 5 Feb 2010 10:27:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932763Ab0BDX0k (ORCPT ); Thu, 4 Feb 2010 18:26:40 -0500 Received: from p01c11o148.mxlogic.net ([208.65.144.71]:59312 "EHLO p01c11o148.mxlogic.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932699Ab0BDX0j convert rfc822-to-8bit (ORCPT ); Thu, 4 Feb 2010 18:26:39 -0500 Received: from unknown [65.218.208.2] by p01c11o148.mxlogic.net(mxl_mta-6.5.0-0) with SMTP id da75b6b4.0.75787.00-006.189151.p01c11o148.mxlogic.net (envelope-from ); Thu, 04 Feb 2010 16:26:39 -0700 (MST) X-MXL-Hash: 4b6b57af68979ca6-cc7b5df56f9d56807ea187fca83ce75fc8e6f785 Received: from MORGANITE.micrel.com ([10.25.1.82]) by Peridot.micrel.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 4 Feb 2010 15:26:32 -0800 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Subject: [PATCH 2.6.33 3/4] net: Makefile change for KSZ884X driver Date: Thu, 4 Feb 2010 15:26:32 -0800 Message-ID: <14385191E87B904DBD836449AA30269D021A54@MORGANITE.micrel.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH 2.6.33 3/4] net: Makefile change for KSZ884X driver Thread-Index: Acql8Xw+H3+ymifeQPuicir26/xcjQ== From: "Ha, Tristram" To: "Dave Miller" Cc: , X-OriginalArrivalTime: 04 Feb 2010 23:26:32.0418 (UTC) FILETIME=[7C468C20:01CAA5F1] 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=t5jVkz02HvQA:10 a=J3BOMSfJb05aRia9DmE+FQ==:17 ] X-AnalysisOut: [a=Q4n7fi2PAAAA:8 a=cOmUgS1p8QT4h099ImMA:9 a=dJQiKqarB2VOBZ] X-AnalysisOut: [CoSaiqe_Qi-zEA: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 KSZ884X network driver for KSZ8841/KSZ8842 PCI Ethernet chips. 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-rc3.old/drivers/net/Makefile 2010-01-05 16:02:46.000000000 -0800 +++ linux-2.6.33-rc3.new/drivers/net/Makefile 2010-01-12 18:56:37.000000000 -0800 @@ -95,6 +95,7 @@ obj-$(CONFIG_SKFP) += skfp/ obj-$(CONFIG_KS8842) += ks8842.o obj-$(CONFIG_KS8851) += ks8851.o obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o +obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o obj-$(CONFIG_VIA_RHINE) += via-rhine.o obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o