Home » Mailing list archives » linux-kernel » 2008 » August » 21

[PATCH 3/9] netdev: drop CONFIG_PPC_MERGE from Kconfig

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Kumar Gala <galak@...>
To: <linux-kernel@...>
Cc: <akpm@...>, <netdev@...>, <jgarzik@...>
Subject: [PATCH 3/9] netdev: drop CONFIG_PPC_MERGE from Kconfig
Date: Thursday, August 21, 2008 - 12:46 am

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>
---
 drivers/net/Kconfig             |    2 +-
 drivers/net/ibm_newemac/Kconfig |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a5c141c..dd2cafb 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1813,7 +1813,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 --git a/drivers/net/ibm_newemac/Kconfig b/drivers/net/ibm_newemac/Kconfig
index 70a3272..bcec732 100644
--- a/drivers/net/ibm_newemac/Kconfig
+++ b/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
-- 
1.5.5.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/08] powerpc: Remove use of CONFIG_PPC_MERGE, Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 1/9] usb: remove code associated with !CONFIG_PPC_MERGE, Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 2/9] fs-enet: remove code associated with !CONFIG_PPC..., Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 3/9] netdev: drop CONFIG_PPC_MERGE from Kconfig, Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 4/9] rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE, Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 5/9] serial/mpc52xx_uart: remove code associated with..., Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 6/9] mpc52xx_psc_spi: remove code associated with !CO..., Kumar Gala, (Thu Aug 21, 12:46 am)
Re: [PATCH 6/9] mpc52xx_psc_spi: remove code associated with..., Kumar Gala, (Wed Oct 15, 5:23 pm)
Re: [PATCH 6/9] mpc52xx_psc_spi: remove code associated with..., David Brownell, (Wed Oct 15, 5:34 pm)
[PATCH 7/9] powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC ..., Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 8/9] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_..., Kumar Gala, (Thu Aug 21, 12:46 am)
[PATCH 9/9] mtd: remove code associated with !CONFIG_PPC_MERGE, Kumar Gala, (Thu Aug 21, 12:46 am)