iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

Browse Source
This commit is contained in:
Paul Mackerras 2008-12-09 14:58:37 +11:00
commit ab44f4627e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/configs/83xx/mpc834x_itx_defconfig
View File

@ -723,7 +723,7 @@ CONFIG_CICADA_PHY=y
# CONFIG_BROADCOM_PHY is not set # CONFIG_BROADCOM_PHY is not set
# CONFIG_ICPLUS_PHY is not set # CONFIG_ICPLUS_PHY is not set
# CONFIG_REALTEK_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_MDIO_BITBANG is not set
# CONFIG_NET_ETHERNET is not set # CONFIG_NET_ETHERNET is not set
CONFIG_NETDEV_1000=y CONFIG_NETDEV_1000=y

2
arch/powerpc/configs/mpc83xx_defconfig
View File

@ -682,7 +682,7 @@ CONFIG_VITESSE_PHY=y
# CONFIG_BROADCOM_PHY is not set # CONFIG_BROADCOM_PHY is not set
CONFIG_ICPLUS_PHY=y CONFIG_ICPLUS_PHY=y
# CONFIG_REALTEK_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_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y CONFIG_NET_ETHERNET=y
CONFIG_MII=y CONFIG_MII=y