linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	jgarzik@mandrakesoft.com
Subject: PATCH: move tulip into ethernet 10,100
Date: 02 Oct 2002 23:02:15 +0100	[thread overview]
Message-ID: <1033596135.25475.11.camel@irongate.swansea.linux.org.uk> (raw)

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.2.5.40/drivers/net/Config.in linux.2.5.40-ac1/drivers/net/Config.in
--- linux.2.5.40/drivers/net/Config.in	2002-10-02 21:33:55.000000000 +0100
+++ linux.2.5.40-ac1/drivers/net/Config.in	2002-10-02 22:17:39.000000000 +0100
@@ -108,6 +108,9 @@
       dep_tristate '    NI5210 support' CONFIG_NI52 $CONFIG_ISA
       dep_tristate '    NI6510 support' CONFIG_NI65 $CONFIG_ISA
    fi
+   if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_CARDBUS" != "n" ]; then
+      source drivers/net/tulip/Config.in
+   fi
    if [ "$CONFIG_ISA" = "y" -o "$CONFIG_MCA" = "y" ]; then
          dep_tristate '  AT1700/1720 support (EXPERIMENTAL)' CONFIG_AT1700 $CONFIG_EXPERIMENTAL
    fi
@@ -320,9 +326,6 @@
 
 source drivers/net/wan/Config.in
 
-if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_CARDBUS" != "n" ]; then
-   source drivers/net/tulip/Config.in
-fi
 if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
    source drivers/net/pcmcia/Config.in
 fi



                 reply	other threads:[~2002-10-02 21:49 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1033596135.25475.11.camel@irongate.swansea.linux.org.uk \
    --to=alan@lxorguk.ukuu.org.uk \
    --cc=jgarzik@mandrakesoft.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@transmeta.com \
    /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).