diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-02 09:42:17 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-02 09:42:17 +0200 |
| commit | dd8164c1dd7f511aa362f548fd8c4882bee3fd54 (patch) | |
| tree | c89aa82919c776376875b631510091b029eb1458 /arch/powerpc/configs | |
| parent | powerpc: Handle both new style and old style reserve maps (diff) | |
| parent | powerpc/fsl: add MPIC timer wakeup support (diff) | |
| download | linux-dd8164c1dd7f511aa362f548fd8c4882bee3fd54.tar.xz linux-dd8164c1dd7f511aa362f548fd8c4882bee3fd54.zip | |
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 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 |