diff options
| author | Tony Breeds <tony@bakeyournoodle.com> | 2011-08-18 21:33:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-18 21:33:49 -0700 |
| commit | 3b3bceef26f8273b1f51c503e9485a35b8326417 (patch) | |
| tree | 6cf64c541343d0c50470002516f254d4ced63a85 /arch/powerpc/configs/40x/makalu_defconfig | |
| parent | e88db79b0131b2067bee2e866fd7021fc5af84be (diff) | |
| download | kernel_samsung_smdk4412-3b3bceef26f8273b1f51c503e9485a35b8326417.zip kernel_samsung_smdk4412-3b3bceef26f8273b1f51c503e9485a35b8326417.tar.gz kernel_samsung_smdk4412-3b3bceef26f8273b1f51c503e9485a35b8326417.tar.bz2 | |
net: fix IBM EMAC driver after rename.
In commit 9aa3283595451ca093500ff0977b106e1f465586 (ehea/ibm*: Move the
IBM drivers) the IBM_NEW_EMAC* were renames to IBM_EMAC*
The conversion was incomplete so that even if the driver was added to
the .config it wasn't built, but there were no errors). In this commit
we also update the various defconfigs that use EMAC to use the new
Kconfig symbol, and explicitly add the NET_VENDOR_IBM guard.
We do not explicitly select the Kconfig dependencies, as this would force
EMAC on. Doing it in the defconfig allows more flexibility.
Tested on a canyondlands board.
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/powerpc/configs/40x/makalu_defconfig')
| -rw-r--r-- | arch/powerpc/configs/40x/makalu_defconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/configs/40x/makalu_defconfig b/arch/powerpc/configs/40x/makalu_defconfig index 3c142ac..42b9793 100644 --- a/arch/powerpc/configs/40x/makalu_defconfig +++ b/arch/powerpc/configs/40x/makalu_defconfig @@ -43,10 +43,11 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=35000 # CONFIG_MISC_DEVICES is not set CONFIG_NETDEVICES=y -CONFIG_NET_ETHERNET=y -CONFIG_IBM_NEW_EMAC=y -CONFIG_IBM_NEW_EMAC_RXB=256 -CONFIG_IBM_NEW_EMAC_TXB=256 +CONFIG_ETHERNET=y +CONFIG_NET_VENDOR_IBM=y +CONFIG_IBM_EMAC=y +CONFIG_IBM_EMAC_RXB=256 +CONFIG_IBM_EMAC_TXB=256 # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set # CONFIG_INPUT is not set |