From: Jan-Bernd Themann <ossthema@de.ibm.com>

Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/net/Kconfig  |    6 ++++++
 drivers/net/Makefile |    1 +
 2 files changed, 7 insertions(+)

diff -puN drivers/net/Kconfig~ehea-kernel-build-kconfig--makefile drivers/net/Kconfig
--- a/drivers/net/Kconfig~ehea-kernel-build-kconfig--makefile
+++ a/drivers/net/Kconfig
@@ -2343,6 +2343,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 -puN drivers/net/Makefile~ehea-kernel-build-kconfig--makefile drivers/net/Makefile
--- a/drivers/net/Makefile~ehea-kernel-build-kconfig--makefile
+++ a/drivers/net/Makefile
@@ -6,6 +6,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
 
_