netdev: drop CONFIG_PPC_MERGE from Kconfig
Subsystems (2)
PATCH 12/21 netdev: drop CONFIG_PPC_MERGE from Kconfig
From: Kumar Gala <[email protected]>
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 Kumar Gala <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Josh Boyer <[email protected]>
Cc David Gibson <[email protected]>
Cc Jeff Garzik <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/net/Kconfig | 2 +- drivers/net/ibm_newemac/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/Kconfig renamed from drivers/net/Kconfig~netdev-drop-config_ppc_merge-from-kconfig +1 -1
@@ -1800,7 +1800,7 @@ config FEC2 config FEC_MPC52xx tristate "MPC52xx FEC driver" - depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC + depends on PPC_MPC52xx && PPC_BESTCOMM_FEC select CRC32 select PHYLIB ---help---
drivers/net/ibm_newemac/Kconfig renamed from drivers/net/ibm_newemac/Kconfig~netdev-drop-config_ppc_merge-from-kconfig +1 -1
@@ -1,6 +1,6 @@ config IBM_NEW_EMAC tristate "IBM EMAC Ethernet support" - depends on PPC_DCR && PPC_MERGE + depends on PPC_DCR select CRC32 help This driver supports the IBM EMAC family of Ethernet controllers
_
Jeff Garzik
AppliedQuoted 12 lines · [email protected] wrote:
From: Kumar Gala <[email protected]>
Now that
arch/ppcis deadCONFIG_PPC_MERGEis always defined for all powerpc platforms so we don't need to depend on it.Signed-off-by Kumar Gala <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Josh Boyer <[email protected]>Cc David Gibson <[email protected]>Cc Jeff Garzik <[email protected]>Signed-off-by Andrew Morton <[email protected]>
Quoted 5 lines
---
drivers/net/Kconfig | 2 +- drivers/net/ibm_newemac/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
applied