aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-06-24 17:16:06 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-06-24 22:58:29 -0400
commit485ca22a10b3d3a4d156e170a541b8c3a5144f8c (patch)
treea29fe2d5bf657e54cb3557d1a4055f10565754b4 /drivers/net
parent2fcf06ca67d1cd5fcf748b3f70ef9e724951fab4 (diff)
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
938 To compile this driver as a module, choose M here. The module 938 To compile this driver as a module, choose M here. The module
939 will be called dm9000. 939 will be called dm9000.
940 940
941config DM9000_DEBUGLEVEL
942 int "DM9000 maximum debug level"
943 depends on DM9000
944 default 4
945 help
946 The maximum level of debugging code compiled into the DM9000
947 driver.
948
941config DM9000_FORCE_SIMPLE_PHY_POLL 949config DM9000_FORCE_SIMPLE_PHY_POLL
942 bool "Force simple NSR based PHY polling" 950 bool "Force simple NSR based PHY polling"
943 depends on DM9000 951 depends on DM9000
@@ -964,14 +972,6 @@ config ENC28J60_WRITEVERIFY
964 Enable the verify after the buffer write useful for debugging purpose. 972 Enable the verify after the buffer write useful for debugging purpose.
965 If unsure, say N. 973 If unsure, say N.
966 974
967config DM9000_DEBUGLEVEL
968 int "DM9000 maximum debug level"
969 depends on DM9000
970 default 4
971 help
972 The maximum level of debugging code compiled into the DM9000
973 driver.
974
975config SMC911X 975config SMC911X
976 tristate "SMSC LAN911[5678] support" 976 tristate "SMSC LAN911[5678] support"
977 select CRC32 977 select CRC32