From: Kumar Gala <galak@kernel.crashing.org>
To: linuxppc-dev@ozlabs.org
Cc: netdev@vger.kernel.org, jgarzik@pobox.com, linux-kernel@vger.kernel.org
Subject: [PATCH 04/10] netdev: drop CONFIG_PPC_MERGE from Kconfig
Date: Fri, 1 Aug 2008 11:44:14 -0500 [thread overview]
Message-ID: <1217609060-6381-5-git-send-email-galak@kernel.crashing.org> (raw)
In-Reply-To: <1217609060-6381-4-git-send-email-galak@kernel.crashing.org>
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 fa533c2..4e89c81 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1812,7 +1812,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
next prev parent reply other threads:[~2008-08-01 16:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-01 16:44 [PATCH 00/10] powerpc: Remove use of CONFIG_PPC_MERGE Kumar Gala
2008-08-01 16:44 ` [PATCH 01/10] " Kumar Gala
2008-08-01 16:44 ` [PATCH 02/10] usb: remove code associated with !CONFIG_PPC_MERGE Kumar Gala
2008-08-01 16:44 ` [PATCH 03/10] fs-enet: " Kumar Gala
2008-08-01 16:44 ` Kumar Gala [this message]
2008-08-01 16:44 ` [PATCH 05/10] rtc: use CONFIG_PPC instead of CONFIG_PPC_MERGE Kumar Gala
2008-08-01 16:44 ` [PATCH 06/10] serial/mpc52xx_uart: remove code associated with !CONFIG_PPC_MERGE Kumar Gala
2008-08-01 16:44 ` [PATCH 07/10] mpc52xx_psc_spi: " Kumar Gala
2008-08-01 16:44 ` [PATCH 08/10] powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks Kumar Gala
2008-08-01 16:44 ` [PATCH 09/10] pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC Kumar Gala
2008-08-01 16:44 ` [PATCH 10/10] mtd: remove code associated with !CONFIG_PPC_MERGE Kumar Gala
2008-08-01 17:49 ` Josh Boyer
2008-08-01 18:57 ` [PATCH 03/10] fs-enet: " Scott Wood
2008-08-02 2:38 ` [PATCH 01/10] powerpc: Remove use of CONFIG_PPC_MERGE Michael Ellerman
2008-08-01 23:53 ` [PATCH 00/10] " Paul Mackerras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1217609060-6381-5-git-send-email-galak@kernel.crashing.org \
--to=galak@kernel.crashing.org \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).