netdev: drop CONFIG_PPC_MERGE from Kconfig

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

authored by

Kumar Gala and committed by

Jeff Garzik 17 years ago 83dad4c3 e2f092ff

+2 -2

2 changed files

expand all

drivers

net

Kconfig

ibm_newemac

Kconfig

+1 -1

drivers/net/Kconfig

··· 1813 1813 1814 1814 config FEC_MPC52xx 1815 1815 tristate "MPC52xx FEC driver" 1816 - depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC 1816 + depends on PPC_MPC52xx && PPC_BESTCOMM_FEC 1817 1817 select CRC32 1818 1818 select PHYLIB 1819 1819 ---help---

+1 -1

drivers/net/ibm_newemac/Kconfig

··· 1 1 config IBM_NEW_EMAC 2 2 tristate "IBM EMAC Ethernet support" 3 - depends on PPC_DCR && PPC_MERGE 3 + depends on PPC_DCR 4 4 select CRC32 5 5 help 6 6 This driver supports the IBM EMAC family of Ethernet controllers