summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBen Dooks2008-06-24 23:16:06 +0200
committerJeff Garzik2008-06-25 04:58:29 +0200
commit485ca22a10b3d3a4d156e170a541b8c3a5144f8c (patch)
treea29fe2d5bf657e54cb3557d1a4055f10565754b4 /drivers/net
parentDM9000: Add missing msleep() in EEPROM wait code. (diff)
downloadkernel-qcow2-linux-485ca22a10b3d3a4d156e170a541b8c3a5144f8c.tar.gz
kernel-qcow2-linux-485ca22a10b3d3a4d156e170a541b8c3a5144f8c.tar.xz
kernel-qcow2-linux-485ca22a10b3d3a4d156e170a541b8c3a5144f8c.zip
DM9000: Re-unite menuconfig entries for DM9000 driver
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> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/Kconfig16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4d69474b6125..9df3a1d97313 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -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