From: Martin Michlmayr <tbm@cyrius.com>
To: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org, akpm@osdl.org
Subject: [PATCH 4/6] [NET] Fix NET_SB1250_MAC Kconfig order to match Linus' tree
Date: Mon, 20 Mar 2006 04:36:10 +0000 [thread overview]
Message-ID: <20060320043610.GD20200@deprecation.cyrius.com> (raw)
In-Reply-To: <20060320043445.GA20171@deprecation.cyrius.com>
The Kconfig option NET_SB1250_MAC is listed in different places in
drivers/net/Kconfig in the Linus' and linux-mips trees. Bring them
into sync.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- mips.git/drivers/net/Kconfig 2006-03-13 18:43:52.000000000 +0000
+++ linux-2.6/drivers/net/Kconfig 2006-03-13 18:55:59.000000000 +0000
@@ -460,6 +452,10 @@
If you have an Alchemy Semi AU1X00 based system
say Y. Otherwise, say N.
+config NET_SB1250_MAC
+ tristate "SB1250 Ethernet support"
+ depends on NET_ETHERNET && SIBYTE_SB1xxx_SOC
+
config SGI_IOC3_ETH
bool "SGI IOC3 Ethernet"
depends on NET_ETHERNET && PCI && SGI_IP27
@@ -2009,10 +1997,6 @@
If in doubt, say N.
-config NET_SB1250_MAC
- tristate "SB1250 Ethernet support"
- depends on SIBYTE_SB1xxx_SOC
-
config R8169_VLAN
bool "VLAN support"
depends on R8169 && VLAN_8021Q
--
Martin Michlmayr
http://www.cyrius.com/
next prev parent reply other threads:[~2006-03-20 4:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-20 4:34 Bring linux-mips in sync with Linus' tree Martin Michlmayr
2006-03-20 4:35 ` [PATCH 1/6] [CHAR] Remove obsolete IBM z50 (vr41xx) keyboard map Martin Michlmayr
2006-03-20 4:35 ` [PATCH 2/6] [VIDEO] Remove trailing whitespace from drivers/video/Kconfig Martin Michlmayr
2006-03-20 4:35 ` [PATCH 3/6] Remove bogus blank lines - sync with Linus' tree Martin Michlmayr
2006-03-20 4:36 ` Martin Michlmayr [this message]
2006-03-20 4:36 ` [PATCH 5/6] [MIPS] vr41xx: remove timex.h Martin Michlmayr
2006-03-20 4:36 ` [PATCH 6/6] [MTD] Remove typecast from drivers/mtd/maps/lasat.c Martin Michlmayr
2006-03-20 5:06 ` Bring linux-mips in sync with Linus' tree Andrew Morton
2006-03-20 5:20 ` Martin Michlmayr
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=20060320043610.GD20200@deprecation.cyrius.com \
--to=tbm@cyrius.com \
--cc=akpm@osdl.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.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