From 4bcf86e9beba59be9de1c3ea7af6ba9dacf22606 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Tue, 21 Feb 2012 05:16:28 +0000
Subject: [PATCH] [powerpc/powerpc64] Enable IBM_EMAC (previously IBM_NEW_EMAC)

svn path=/dists/sid/linux-2.6/; revision=18727
---
 debian/changelog                       |  1 +
 debian/config/powerpc/config.powerpc64 | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a0c0091f..9d74e4635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ linux-2.6 (3.2.6-2) UNRELEASED; urgency=low
   * fs: Enable EFI_PARTITION in all configurations (Closes: #660582)
   * [i386] Re-enable INTEL_IOMMU, IRQ_REMAP
   * [mips/r5k-ip32] Enable INPUT_SGI_BTNS (previously INPUT_SGIO2_BTNS)
+  * [powerpc/powerpc64] Enable IBM_EMAC (previously IBM_NEW_EMAC)
 
   [ Bastian Blank ]
   * Don't advertise Xen support for rt images. (closes: #659988)
diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64
index 918ad44eb..5cf63de40 100644
--- a/debian/config/powerpc/config.powerpc64
+++ b/debian/config/powerpc/config.powerpc64
@@ -117,6 +117,17 @@ CONFIG_WINDFARM_PM112=m
 CONFIG_IBMVETH=m
 CONFIG_EHEA=m
 
+##
+## file: drivers/net/ethernet/ibm/emac/Kconfig
+##
+CONFIG_IBM_EMAC=m
+# CONFIG_IBM_EMAC_DEBUG is not set
+CONFIG_IBM_EMAC_POLL_WEIGHT=32
+CONFIG_IBM_EMAC_RXB=128
+CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
+CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
+CONFIG_IBM_EMAC_TXB=64
+
 ##
 ## file: drivers/net/ethernet/marvell/Kconfig
 ##
@@ -200,14 +211,3 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_SND_PS3=m
 CONFIG_SND_PS3_DEFAULT_START_DELAY=2000
 
-##
-## file: unknown
-##
-CONFIG_IBM_NEW_EMAC=m
-# CONFIG_IBM_NEW_EMAC_DEBUG is not set
-CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
-CONFIG_IBM_NEW_EMAC_RXB=128
-CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
-CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
-CONFIG_IBM_NEW_EMAC_TXB=64
-