Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751143AbWIFOVE (ORCPT ); Wed, 6 Sep 2006 10:21:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751148AbWIFOVD (ORCPT ); Wed, 6 Sep 2006 10:21:03 -0400 Received: from mtagate1.uk.ibm.com ([195.212.29.134]:9787 "EHLO mtagate1.uk.ibm.com") by vger.kernel.org with ESMTP id S1751143AbWIFOU7 (ORCPT ); Wed, 6 Sep 2006 10:20:59 -0400 From: Jan-Bernd Themann Subject: [2.6.19 PATCH 7/7] ehea: Makefile & Kconfig Date: Wed, 6 Sep 2006 15:38:34 +0200 User-Agent: KMail/1.8.2 MIME-Version: 1.0 Content-Disposition: inline To: netdev Cc: Christoph Raisch , "Jan-Bernd Themann" , "linux-kernel" , "linux-ppc" , Marcus Eder , Thomas Klein Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <200609061538.34319.ossthema@de.ibm.com> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1626 Lines: 44 Signed-off-by: Jan-Bernd Themann drivers/net/Kconfig | 9 +++++++++ drivers/net/Makefile | 1 + 2 files changed, 10 insertions(+) diff -Nurp -X dontdiff linux-2.6.18-rc6/drivers/net/Kconfig patched_kernel/drivers/net/Kconfig --- linux-2.6.18-rc6/drivers/net/Kconfig 2006-09-04 04:19:48.000000000 +0200 +++ patched_kernel/drivers/net/Kconfig 2006-09-04 11:38:59.000000000 +0200 @@ -2318,6 +2318,15 @@ config CHELSIO_T1 To compile this driver as a module, choose M here: the module will be called cxgb. +config EHEA + tristate "eHEA Ethernet support" + depends on IBMEBUS + ---help--- + This driver supports the IBM pSeries eHEA ethernet adapter. + + To compile the driver as a module, choose M here. The module + will be called ehea. + config IXGB tristate "Intel(R) PRO/10GbE support" depends on PCI diff -Nurp -X dontdiff linux-2.6.18-rc6/drivers/net/Makefile patched_kernel/drivers/net/Makefile --- linux-2.6.18-rc6/drivers/net/Makefile 2006-09-04 04:19:48.000000000 +0200 +++ patched_kernel/drivers/net/Makefile 2006-09-04 11:39:06.000000000 +0200 @@ -10,6 +10,7 @@ obj-$(CONFIG_E1000) += e1000/ obj-$(CONFIG_IBM_EMAC) += ibm_emac/ obj-$(CONFIG_IXGB) += ixgb/ obj-$(CONFIG_CHELSIO_T1) += chelsio/ +obj-$(CONFIG_EHEA) += ehea/ obj-$(CONFIG_BONDING) += bonding/ obj-$(CONFIG_GIANFAR) += gianfar_driver.o - 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/