aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-07-02 07:42:17 (GMT)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-07-02 07:42:17 (GMT)
commitdd8164c1dd7f511aa362f548fd8c4882bee3fd54 (patch)
treec89aa82919c776376875b631510091b029eb1458 /arch/powerpc/configs
parentc039e3a8ddd52139d0f81711ecd757772f868b22 (diff)
parenta63b3bc7db32b63bfe5f48fa8582f931db81c86e (diff)
Merge remote-tracking branch 'scott/next' into next
Merge Freescale updates
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r--arch/powerpc/configs/mpc85xx_smp_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index 165e6b3..152fa05 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -131,6 +131,7 @@ CONFIG_DUMMY=y
CONFIG_FS_ENET=y
CONFIG_UCC_GETH=y
CONFIG_GIANFAR=y
+CONFIG_E1000E=y
CONFIG_MARVELL_PHY=y
CONFIG_DAVICOM_PHY=y
CONFIG_CICADA_PHY=y

Privacy Policy