diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-09 04:58:37 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-09 04:58:37 +0100 |
| commit | ab44f4627e2160cddbddbe8aa8b1d2b2e1559790 (patch) | |
| tree | 3cb3ee3baf66d2a1ef84051fadc6696839b4f380 /arch/powerpc | |
| parent | powerpc/virtex5: Fix Virtex5 machine check handling (diff) | |
| parent | powerpc/83xx: Enable FIXED_PHY in mpc834x_itx and mpc83xx defconfigs (diff) | |
| download | linux-ab44f4627e2160cddbddbe8aa8b1d2b2e1559790.tar.xz linux-ab44f4627e2160cddbddbe8aa8b1d2b2e1559790.zip | |
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/configs/mpc83xx_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index e55ff7c47a36..07a674f5344e 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig @@ -723,7 +723,7 @@ CONFIG_CICADA_PHY=y # CONFIG_BROADCOM_PHY is not set # CONFIG_ICPLUS_PHY is not set # CONFIG_REALTEK_PHY is not set -# CONFIG_FIXED_PHY is not set +CONFIG_FIXED_PHY=y # CONFIG_MDIO_BITBANG is not set # CONFIG_NET_ETHERNET is not set CONFIG_NETDEV_1000=y diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 15eb30c9b3f9..d582014b0a38 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig @@ -682,7 +682,7 @@ CONFIG_VITESSE_PHY=y # CONFIG_BROADCOM_PHY is not set CONFIG_ICPLUS_PHY=y # CONFIG_REALTEK_PHY is not set -# CONFIG_FIXED_PHY is not set +CONFIG_FIXED_PHY=y # CONFIG_MDIO_BITBANG is not set CONFIG_NET_ETHERNET=y CONFIG_MII=y |