| Message ID | 200809222152.m8MLqJsW031972@imap1.linux-foundation.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | Jeff Garzik |
| Headers | show |
akpm@linux-foundation.org wrote: > From: Kumar Gala <galak@kernel.crashing.org> > > 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 <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: Andrew Morton <akpm@linux-foundation.org> > --- > > drivers/net/Kconfig | 2 +- > drivers/net/ibm_newemac/Kconfig | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) applied -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff -puN drivers/net/Kconfig~netdev-drop-config_ppc_merge-from-kconfig drivers/net/Kconfig --- a/drivers/net/Kconfig~netdev-drop-config_ppc_merge-from-kconfig +++ a/drivers/net/Kconfig @@ -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--- diff -puN drivers/net/ibm_newemac/Kconfig~netdev-drop-config_ppc_merge-from-kconfig drivers/net/ibm_newemac/Kconfig --- a/drivers/net/ibm_newemac/Kconfig~netdev-drop-config_ppc_merge-from-kconfig +++ a/drivers/net/ibm_newemac/Kconfig @@ -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