From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mtagate3.uk.ibm.com (mtagate3.uk.ibm.com [195.212.29.136]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mtagate3.uk.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTP id AF91967C2A for ; Mon, 4 Sep 2006 21:27:06 +1000 (EST) Received: from d06nrmr1407.portsmouth.uk.ibm.com (d06nrmr1407.portsmouth.uk.ibm.com [9.149.38.185]) by mtagate3.uk.ibm.com (8.13.7/8.13.7) with ESMTP id k84BQvrA161836 for ; Mon, 4 Sep 2006 12:26:58 +0100 Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.6/8.13.6/NCO v8.1.1) with ESMTP id k84BT2Cj1581146 for ; Mon, 4 Sep 2006 12:29:02 +0100 Received: from d06av03.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id k84BQvfB019550 for ; Mon, 4 Sep 2006 12:26:57 +0100 From: Jan-Bernd Themann Subject: [2.6.19 PATCH 7/7] ehea: Makefile & Kconfig Date: Mon, 4 Sep 2006 12:44:53 +0200 MIME-Version: 1.0 To: netdev , Jeff Garzik Content-Type: text/plain; charset="us-ascii" Message-Id: <200609041244.53416.ossthema@de.ibm.com> Cc: Thomas Klein , Jan-Bernd Themann , linux-kernel , linux-ppc , Christoph Raisch , Marcus Eder List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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