Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750927AbWHNQcG (ORCPT ); Mon, 14 Aug 2006 12:32:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751569AbWHNQcF (ORCPT ); Mon, 14 Aug 2006 12:32:05 -0400 Received: from mtagate3.uk.ibm.com ([195.212.29.136]:10424 "EHLO mtagate3.uk.ibm.com") by vger.kernel.org with ESMTP id S1750927AbWHNQcC (ORCPT ); Mon, 14 Aug 2006 12:32:02 -0400 Message-ID: <44E0A580.9020507@de.ibm.com> Date: Mon, 14 Aug 2006 18:32:00 +0200 From: Jan-Bernd Themann User-Agent: Thunderbird 1.5 (X11/20051201) MIME-Version: 1.0 To: netdev CC: linux-ppc , linux-kernel , Marcus Eder , Christoph Raisch , Thomas Klein , Jan-Bernd Themann , Thomas Klein Subject: [PATCH 7/7] ehea: Makefile & Kconfig Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1564 Lines: 43 Signed-off-by: Jan-Bernd Themann drivers/net/Kconfig | 6 ++++++ drivers/net/Makefile | 1 + 2 files changed, 7 insertions(+) diff -Nurp -X dontdiff linux-2.6.18-rc4/drivers/net/Kconfig patched_kernel/drivers/net/Kconfig --- linux-2.6.18-rc4/drivers/net/Kconfig 2006-08-06 11:20:11.000000000 -0700 +++ patched_kernel/drivers/net/Kconfig 2006-08-08 03:00:49.526421944 -0700 @@ -2277,6 +2277,12 @@ 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 ethernet adapter + config IXGB tristate "Intel(R) PRO/10GbE support" depends on PCI diff -Nurp -X dontdiff linux-2.6.18-rc4/drivers/net/Makefile patched_kernel/drivers/net/Makefile --- linux-2.6.18-rc4/drivers/net/Makefile 2006-08-06 11:20:11.000000000 -0700 +++ patched_kernel/drivers/net/Makefile 2006-08-08 03:00:30.061451584 -0700 @@ -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/