diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-08 22:58:37 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-08 22:58:37 -0500 |
| commit | ab44f4627e2160cddbddbe8aa8b1d2b2e1559790 (patch) | |
| tree | 3cb3ee3baf66d2a1ef84051fadc6696839b4f380 /arch | |
| parent | 640d17d60e83401e10e66a0ab6e9e2d6350df656 (diff) | |
| parent | b2c2717bae3ad62f18a51ea10188176134bac79c (diff) | |
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch')
| -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 | |||
| 723 | # CONFIG_BROADCOM_PHY is not set | 723 | # CONFIG_BROADCOM_PHY is not set |
| 724 | # CONFIG_ICPLUS_PHY is not set | 724 | # CONFIG_ICPLUS_PHY is not set |
| 725 | # CONFIG_REALTEK_PHY is not set | 725 | # CONFIG_REALTEK_PHY is not set |
| 726 | # CONFIG_FIXED_PHY is not set | 726 | CONFIG_FIXED_PHY=y |
| 727 | # CONFIG_MDIO_BITBANG is not set | 727 | # CONFIG_MDIO_BITBANG is not set |
| 728 | # CONFIG_NET_ETHERNET is not set | 728 | # CONFIG_NET_ETHERNET is not set |
| 729 | CONFIG_NETDEV_1000=y | 729 | 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 | |||
| 682 | # CONFIG_BROADCOM_PHY is not set | 682 | # CONFIG_BROADCOM_PHY is not set |
| 683 | CONFIG_ICPLUS_PHY=y | 683 | CONFIG_ICPLUS_PHY=y |
| 684 | # CONFIG_REALTEK_PHY is not set | 684 | # CONFIG_REALTEK_PHY is not set |
| 685 | # CONFIG_FIXED_PHY is not set | 685 | CONFIG_FIXED_PHY=y |
| 686 | # CONFIG_MDIO_BITBANG is not set | 686 | # CONFIG_MDIO_BITBANG is not set |
| 687 | CONFIG_NET_ETHERNET=y | 687 | CONFIG_NET_ETHERNET=y |
| 688 | CONFIG_MII=y | 688 | CONFIG_MII=y |