summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/44x/sam440ep_defconfig
diff options
context:
space:
mode:
authorTony Breeds <tony@bakeyournoodle.com>2011-08-18 21:33:49 -0700
committerDavid S. Miller <davem@davemloft.net>2011-08-18 21:33:49 -0700
commit3b3bceef26f8273b1f51c503e9485a35b8326417 (patch)
tree6cf64c541343d0c50470002516f254d4ced63a85 /arch/powerpc/configs/44x/sam440ep_defconfig
parente88db79b0131b2067bee2e866fd7021fc5af84be (diff)
downloadtalos-op-linux-3b3bceef26f8273b1f51c503e9485a35b8326417.tar.gz
talos-op-linux-3b3bceef26f8273b1f51c503e9485a35b8326417.zip
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/44x/sam440ep_defconfig')
-rw-r--r--arch/powerpc/configs/44x/sam440ep_defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig
index dfcffede16ad..ca088cd581af 100644
--- a/arch/powerpc/configs/44x/sam440ep_defconfig
+++ b/arch/powerpc/configs/44x/sam440ep_defconfig
@@ -44,8 +44,9 @@ CONFIG_ATA=y
# CONFIG_SATA_PMP is not set
CONFIG_SATA_SIL=y
CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_IBM_NEW_EMAC=y
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_IBM=y
+CONFIG_IBM_EMAC=y
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
CONFIG_INPUT_FF_MEMLESS=m
OpenPOWER on IntegriCloud