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

Commit 3b3bceef authored Aug 18, 2011 by Tony Breeds Committed by David S. Miller Aug 18, 2011

net: fix IBM EMAC driver after rename.



In commit 9aa32835 (ehea/ibm*: Move the
IBM drivers) the IBM_NEW_EMAC* were renames to IBM_EMAC*

The conversion was incomplete so that even if the driver was added to
the .config it wasn't built, but there were no errors).  In this commit
we also update the various defconfigs that use EMAC to use the new
Kconfig symbol, and explicitly add the NET_VENDOR_IBM guard.

We do not explicitly select the Kconfig dependencies, as this would force
EMAC on.  Doing it in the defconfig allows more flexibility.

Tested on a canyondlands board.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e88db79b

arch/powerpc/configs/40x/acadia_defconfig

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -44,12 +44,13 @@ CONFIG_BLK_DEV_RAM=y
	CONFIG_BLK_DEV_RAM_SIZE=35000		CONFIG_BLK_DEV_RAM_SIZE=35000
	# CONFIG_MISC_DEVICES is not set		# CONFIG_MISC_DEVICES is not set
	CONFIG_NETDEVICES=y		CONFIG_NETDEVICES=y
	CONFIG_NET_ETHERNET=y		CONFIG_ETHERNET=y
			CONFIG_NET_VENDOR_IBM=y
	CONFIG_MII=y		CONFIG_MII=y
	CONFIG_IBM_NEW_EMAC=y		CONFIG_IBM_EMAC=y
	CONFIG_IBM_NEW_EMAC_RXB=256		CONFIG_IBM_EMAC_RXB=256
	CONFIG_IBM_NEW_EMAC_TXB=256		CONFIG_IBM_EMAC_TXB=256
	CONFIG_IBM_NEW_EMAC_DEBUG=y		CONFIG_IBM_EMAC_DEBUG=y
	# CONFIG_NETDEV_1000 is not set		# CONFIG_NETDEV_1000 is not set
	# CONFIG_NETDEV_10000 is not set		# CONFIG_NETDEV_10000 is not set
	# CONFIG_INPUT is not set		# CONFIG_INPUT is not set

arch/powerpc/configs/40x/ep405_defconfig

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -42,8 +42,9 @@ CONFIG_PROC_DEVICETREE=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	CONFIG_BLK_DEV_RAM_SIZE=35000		CONFIG_BLK_DEV_RAM_SIZE=35000
	CONFIG_NETDEVICES=y		CONFIG_NETDEVICES=y
	CONFIG_NET_ETHERNET=y		CONFIG_ETHERNET=y
	CONFIG_IBM_NEW_EMAC=y		CONFIG_NET_VENDOR_IBM=y
			CONFIG_IBM_EMAC=y
	# CONFIG_INPUT is not set		# CONFIG_INPUT is not set
	# CONFIG_SERIO is not set		# CONFIG_SERIO is not set
	# CONFIG_VT is not set		# CONFIG_VT is not set

arch/powerpc/configs/40x/hcu4_defconfig

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -43,8 +43,9 @@ CONFIG_PROC_DEVICETREE=y
	CONFIG_BLK_DEV_RAM=y		CONFIG_BLK_DEV_RAM=y
	CONFIG_BLK_DEV_RAM_SIZE=35000		CONFIG_BLK_DEV_RAM_SIZE=35000
	CONFIG_NETDEVICES=y		CONFIG_NETDEVICES=y
	CONFIG_NET_ETHERNET=y		CONFIG_ETHERNET=y
	CONFIG_IBM_NEW_EMAC=y		CONFIG_NET_VENDOR_IBM=y
			CONFIG_IBM_EMAC=y
	# CONFIG_INPUT is not set		# CONFIG_INPUT is not set
	# CONFIG_SERIO is not set		# CONFIG_SERIO is not set
	# CONFIG_VT is not set		# CONFIG_VT is not set

arch/powerpc/configs/40x/kilauea_defconfig

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -51,10 +51,11 @@ CONFIG_BLK_DEV_RAM=y
	CONFIG_BLK_DEV_RAM_SIZE=35000		CONFIG_BLK_DEV_RAM_SIZE=35000
	# CONFIG_MISC_DEVICES is not set		# CONFIG_MISC_DEVICES is not set
	CONFIG_NETDEVICES=y		CONFIG_NETDEVICES=y
	CONFIG_NET_ETHERNET=y		CONFIG_ETHERNET=y
	CONFIG_IBM_NEW_EMAC=y		CONFIG_NET_VENDOR_IBM=y
	CONFIG_IBM_NEW_EMAC_RXB=256		CONFIG_IBM_EMAC=y
	CONFIG_IBM_NEW_EMAC_TXB=256		CONFIG_IBM_EMAC_RXB=256
			CONFIG_IBM_EMAC_TXB=256
	# CONFIG_NETDEV_1000 is not set		# CONFIG_NETDEV_1000 is not set
	# CONFIG_NETDEV_10000 is not set		# CONFIG_NETDEV_10000 is not set
	# CONFIG_INPUT is not set		# CONFIG_INPUT is not set

arch/powerpc/configs/40x/makalu_defconfig

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -43,10 +43,11 @@ CONFIG_BLK_DEV_RAM=y
	CONFIG_BLK_DEV_RAM_SIZE=35000		CONFIG_BLK_DEV_RAM_SIZE=35000
	# CONFIG_MISC_DEVICES is not set		# CONFIG_MISC_DEVICES is not set
	CONFIG_NETDEVICES=y		CONFIG_NETDEVICES=y
	CONFIG_NET_ETHERNET=y		CONFIG_ETHERNET=y
	CONFIG_IBM_NEW_EMAC=y		CONFIG_NET_VENDOR_IBM=y
	CONFIG_IBM_NEW_EMAC_RXB=256		CONFIG_IBM_EMAC=y
	CONFIG_IBM_NEW_EMAC_TXB=256		CONFIG_IBM_EMAC_RXB=256
			CONFIG_IBM_EMAC_TXB=256
	# CONFIG_NETDEV_1000 is not set		# CONFIG_NETDEV_1000 is not set
	# CONFIG_NETDEV_10000 is not set		# CONFIG_NETDEV_10000 is not set
	# CONFIG_INPUT is not set		# CONFIG_INPUT is not set