netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ben Dooks <ben-linux@fluff.org>
To: netdev@vger.kernel.org
Cc: jeff@garzik.org, laurentp@cse-semaphore.com,
	Ben Dooks <ben-linux@fluff.org>
Subject: [patch v3 10/12] DM9000: Re-unit menuconfig entries for DM9000 driver
Date: Tue, 24 Jun 2008 22:16:06 +0100	[thread overview]
Message-ID: <20080624211906.063309080@fluff.org.uk> (raw)
In-Reply-To: 20080624211556.566149406@fluff.org.uk

[-- Attachment #1: simtec/simtec-drivers-net-dm9000-menuconfig.patch --]
[-- Type: text/plain, Size: 1363 bytes --]

The ENC28J60 driver ended up adding itself inbetween the
two DM9000 Kconfig entries, so re-unite the two together.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

Index: linux-2.6.26-rc7-next20080620/drivers/net/Kconfig
===================================================================
--- linux-2.6.26-rc7-next20080620.orig/drivers/net/Kconfig	2008-06-22 21:12:24.000000000 +0100
+++ linux-2.6.26-rc7-next20080620/drivers/net/Kconfig	2008-06-22 21:12:34.000000000 +0100
@@ -938,6 +938,14 @@ config DM9000
 	  To compile this driver as a module, choose M here.  The module
 	  will be called dm9000.
 
+config DM9000_DEBUGLEVEL
+	int "DM9000 maximum debug level"
+	depends on DM9000
+	default 4
+	help
+	  The maximum level of debugging code compiled into the DM9000
+	  driver.
+
 config DM9000_FORCE_SIMPLE_PHY_POLL
 	bool "Force simple NSR based PHY polling"
 	depends on DM9000
@@ -964,14 +972,6 @@ config ENC28J60_WRITEVERIFY
 	  Enable the verify after the buffer write useful for debugging purpose.
 	  If unsure, say N.
 
-config DM9000_DEBUGLEVEL
-	int "DM9000 maximum debug level"
-	depends on DM9000
-	default 4
-	help
-	  The maximum level of debugging code compiled into the DM9000
-	  driver.
-
 config SMC911X
 	tristate "SMSC LAN911[5678] support"
 	select CRC32

-- 
Ben (ben@fluff.org, http://www.fluff.org/)

  'a smiley only costs 4 bytes'

  parent reply	other threads:[~2008-06-24 21:19 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-24 21:15 [patch v3 00/12] DM9000 for next kernel release Ben Dooks
2008-06-24 21:15 ` [patch v3 01/12] DM9000: Remove the 2 resources probe scheme Ben Dooks
2008-06-25  3:06   ` Jeff Garzik
2008-06-26 12:42     ` Ben Dooks
2008-06-24 21:15 ` [patch v3 02/12] DM9000: Fixup blackfin after removing 2 resource usage Ben Dooks
2008-06-24 21:15 ` [patch v3 03/12] DM9000: Add support for DM9000A and DM9000B chips Ben Dooks
2008-06-24 21:16 ` [patch v3 04/12] DM9000: Cleanups after the resource changes Ben Dooks
2008-06-24 21:16 ` [patch v3 05/12] DM9000: Cleanup source code Ben Dooks
2008-06-24 21:16 ` [patch v3 06/12] DM9000: Cleanup source code - remove forward declerations Ben Dooks
2008-06-24 21:16 ` [patch v3 07/12] DM9000: Use NSR to determine link-status on internal PHY Ben Dooks
2008-06-24 21:16 ` [patch v3 08/12] DM9000: Allow the use of the NSR register to get link status Ben Dooks
2008-06-24 21:16 ` [patch v3 09/12] DM9000: Add missing msleep() in EEPROM wait code Ben Dooks
2008-06-24 21:16 ` Ben Dooks [this message]
2008-06-24 21:16 ` [patch v3 11/12] DM9000: Remove DEFAULT_TRIGGER for request_irq() flags Ben Dooks
2008-06-24 21:16 ` [patch v3 12/12] DM9000: Add documentation for the driver Ben Dooks

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=20080624211906.063309080@fluff.org.uk \
    --to=ben-linux@fluff.org \
    --cc=jeff@garzik.org \
    --cc=laurentp@cse-semaphore.com \
    --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).