aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-09-22 17:52:19 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-09-24 22:11:53 -0400
commit83dad4c3773b2be110f9ab0c9031e6129bd2e294 (patch)
tree1ba35395a8ed73a080e7520bd0436e9ebf2552c8 /drivers/net/Kconfig
parente2f092ff9bf2ab515c14d2208b5f08c7d389d5d2 (diff)
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>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 42b4eb703c2d..f6fd0be9ef5e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1813,7 +1813,7 @@ config FEC2
1813 1813
1814config FEC_MPC52xx 1814config FEC_MPC52xx
1815 tristate "MPC52xx FEC driver" 1815 tristate "MPC52xx FEC driver"
1816 depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC 1816 depends on PPC_MPC52xx && PPC_BESTCOMM_FEC
1817 select CRC32 1817 select CRC32
1818 select PHYLIB 1818 select PHYLIB
1819 ---help--- 1819 ---help---