[kernel] r18727 - in dists/sid/linux-2.6/debian: . config/powerpc

[Ben Hutchings]

Author: benh
Date: Tue Feb 21 05:16:28 2012
New Revision: 18727

Log:
[powerpc/powerpc64] Enable IBM_EMAC (previously IBM_NEW_EMAC)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/powerpc/config.powerpc64

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Feb 21 05:13:51 2012	(r18726)
+++ dists/sid/linux-2.6/debian/changelog	Tue Feb 21 05:16:28 2012	(r18727)
@@ -21,6 +21,7 @@
   * 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)

Modified: dists/sid/linux-2.6/debian/config/powerpc/config.powerpc64
==============================================================================
--- dists/sid/linux-2.6/debian/config/powerpc/config.powerpc64	Tue Feb 21 05:13:51 2012	(r18726)
+++ dists/sid/linux-2.6/debian/config/powerpc/config.powerpc64	Tue Feb 21 05:16:28 2012	(r18727)
@@ -118,6 +118,17 @@
 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
 ##
 # CONFIG_MV643XX_ETH is not set
@@ -200,14 +211,3 @@
 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
-