netdev: drop CONFIG_PPC_MERGE from Kconfig
authorKumar Gala <galak@kernel.crashing.org>
Mon, 22 Sep 2008 21:52:19 +0000 (14:52 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 25 Sep 2008 02:11:53 +0000 (22:11 -0400)
commit83dad4c3773b2be110f9ab0c9031e6129bd2e294
tree1ba35395a8ed73a080e7520bd0436e9ebf2552c8
parente2f092ff9bf2ab515c14d2208b5f08c7d389d5d2
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: 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>
drivers/net/Kconfig
drivers/net/ibm_newemac/Kconfig