tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
powerpc/83xx: Enable FIXED_PHY in mpc834x_itx and mpc83xx defconfigs

Linus Torvalds 341e5580 aaad0776

+2 -2
unified split
+1 -1
arch/powerpc/configs/83xx/mpc834x_itx_defconfig
··· 723 # CONFIG_BROADCOM_PHY is not set 724 # CONFIG_ICPLUS_PHY is not set 725 # CONFIG_REALTEK_PHY is not set 726 - # CONFIG_FIXED_PHY is not set 727 # CONFIG_MDIO_BITBANG is not set 728 # CONFIG_NET_ETHERNET is not set 729 CONFIG_NETDEV_1000=y
··· 723 # CONFIG_BROADCOM_PHY is not set 724 # CONFIG_ICPLUS_PHY is not set 725 # CONFIG_REALTEK_PHY is not set 726 + CONFIG_FIXED_PHY=y 727 # CONFIG_MDIO_BITBANG is not set 728 # CONFIG_NET_ETHERNET is not set 729 CONFIG_NETDEV_1000=y
+1 -1
arch/powerpc/configs/mpc83xx_defconfig
··· 682 # CONFIG_BROADCOM_PHY is not set 683 CONFIG_ICPLUS_PHY=y 684 # CONFIG_REALTEK_PHY is not set 685 - # CONFIG_FIXED_PHY is not set 686 # CONFIG_MDIO_BITBANG is not set 687 CONFIG_NET_ETHERNET=y 688 CONFIG_MII=y
··· 682 # CONFIG_BROADCOM_PHY is not set 683 CONFIG_ICPLUS_PHY=y 684 # CONFIG_REALTEK_PHY is not set 685 + CONFIG_FIXED_PHY=y 686 # CONFIG_MDIO_BITBANG is not set 687 CONFIG_NET_ETHERNET=y 688 CONFIG_MII=y