[powerpc/powerpc64] Enable IBM_EMAC (previously IBM_NEW_EMAC)

svn path=/dists/sid/linux-2.6/; revision=18727
This commit is contained in:
Ben Hutchings 2012-02-21 05:16:28 +00:00
parent 0614dd9ddb
commit 4bcf86e9be
2 changed files with 12 additions and 11 deletions

1
debian/changelog vendored
View File

@ -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)

View File

@ -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