Commit ab44f462 authored by Paul Mackerras's avatar Paul Mackerras

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

parents 640d17d6 b2c2717b
...@@ -723,7 +723,7 @@ CONFIG_CICADA_PHY=y ...@@ -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
......
...@@ -682,7 +682,7 @@ CONFIG_VITESSE_PHY=y ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment