lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netdev: drop CONFIG_PPC_MERGE from Kconfig

Browse Source 
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>
This commit is contained in:
Kumar Gala
2008-09-22 14:52:19 -07:00
committed by Jeff Garzik
parent e2f092ff9b
commit 83dad4c377
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/Kconfig
View File

@@ -1813,7 +1813,7 @@ config FEC2
config FEC_MPC52xx config FEC_MPC52xx
tristate "MPC52xx FEC driver" tristate "MPC52xx FEC driver"
depends on PPC_MERGE && PPC_MPC52xx && PPC_BESTCOMM_FEC depends on PPC_MPC52xx && PPC_BESTCOMM_FEC
select CRC32 select CRC32
select PHYLIB select PHYLIB
---help--- ---help---

2
drivers/net/ibm_newemac/Kconfig
View File

@@ -1,6 +1,6 @@
config IBM_NEW_EMAC config IBM_NEW_EMAC
tristate "IBM EMAC Ethernet support" tristate "IBM EMAC Ethernet support"
depends on PPC_DCR && PPC_MERGE depends on PPC_DCR
select CRC32 select CRC32
help help
This driver supports the IBM EMAC family of Ethernet controllers This driver supports the IBM EMAC family of Ethernet controllers