Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab44f462 authored Dec 09, 2008 by Paul Mackerras

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

parents 640d17d6 b2c2717b

arch/powerpc/configs/83xx/mpc834x_itx_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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

arch/powerpc/configs/mpc83xx_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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