diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-02 03:42:17 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-02 03:42:17 -0400 |
| commit | dd8164c1dd7f511aa362f548fd8c4882bee3fd54 (patch) | |
| tree | c89aa82919c776376875b631510091b029eb1458 /arch/powerpc/configs | |
| parent | c039e3a8ddd52139d0f81711ecd757772f868b22 (diff) | |
| parent | a63b3bc7db32b63bfe5f48fa8582f931db81c86e (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_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig index 165e6b32baef..152fa05b15e4 100644 --- a/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/arch/powerpc/configs/mpc85xx_smp_defconfig | |||
| @@ -131,6 +131,7 @@ CONFIG_DUMMY=y | |||
| 131 | CONFIG_FS_ENET=y | 131 | CONFIG_FS_ENET=y |
| 132 | CONFIG_UCC_GETH=y | 132 | CONFIG_UCC_GETH=y |
| 133 | CONFIG_GIANFAR=y | 133 | CONFIG_GIANFAR=y |
| 134 | CONFIG_E1000E=y | ||
| 134 | CONFIG_MARVELL_PHY=y | 135 | CONFIG_MARVELL_PHY=y |
| 135 | CONFIG_DAVICOM_PHY=y | 136 | CONFIG_DAVICOM_PHY=y |
| 136 | CONFIG_CICADA_PHY=y | 137 | CONFIG_CICADA_PHY=y |