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

Commit 83dad4c3 authored by Kumar Gala's avatar Kumar Gala Committed by Jeff Garzik
Browse files

netdev: drop CONFIG_PPC_MERGE from Kconfig 



Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all
powerpc platforms so we don't need to depend on it.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent e2f092ff

drivers/net/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -1813,7 +1813,7 @@ config FEC2 




config FEC_MPC52xx

config FEC_MPC52xx

	tristate "MPC52xx FEC driver"

	tristate "MPC52xx FEC driver"

	depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC

	depends on PPC_MPC52xx && PPC_BESTCOMM_FEC

	select CRC32

	select CRC32

	select PHYLIB

	select PHYLIB

	---help---

	---help---

drivers/net/ibm_newemac/Kconfig

+1 −1
Original line number Original line Diff line number Diff line 
config IBM_NEW_EMAC

config IBM_NEW_EMAC

	tristate "IBM EMAC Ethernet support"

	tristate "IBM EMAC Ethernet support"

	depends on PPC_DCR && PPC_MERGE

	depends on PPC_DCR

	select CRC32

	select CRC32

	help

	help

	  This driver supports the IBM EMAC family of Ethernet controllers

	  This driver supports the IBM EMAC family of Ethernet controllers