Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / drivers / net / wan / Kconfig

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index b5328b0ff927d6b063815a81aea7c388b2241e58..b5d0d7fb647a3455fd4d0e91bf03aa2c5dc75b1e 100644 (file)
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -127,25 +127,13 @@ config LANMEDIA
 # There is no way to detect a Sealevel board. Force it modular
 config SEALEVEL_4021
        tristate "Sealevel Systems 4021 support"
-       depends on WAN && ISA && m && ISA_DMA_API
+       depends on WAN && ISA && m && ISA_DMA_API && INET
        help
          This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.
 
          The driver will be compiled as a module: the
          module will be called sealevel.
 
-config SYNCLINK_SYNCPPP
-       tristate "SyncLink HDLC/SYNCPPP support"
-       depends on WAN
-       help
-         Enables HDLC/SYNCPPP support for the SyncLink WAN driver.
-
-         Normally the SyncLink WAN driver works with the main PPP driver
-         <file:drivers/net/ppp_generic.c> and pppd program.
-         HDLC/SYNCPPP support allows use of the Cisco HDLC/PPP driver
-         <file:drivers/net/wan/syncppp.c>. The SyncLink WAN driver (in
-         character devices) must also be enabled.
-
 # Generic HDLC
 config HDLC
        tristate "Generic HDLC layer"
@@ -166,7 +154,7 @@ config HDLC
          If unsure, say N.
 
 config HDLC_RAW
-       bool "Raw HDLC support"
+       tristate "Raw HDLC support"
        depends on HDLC
        help
          Generic HDLC driver supporting raw HDLC over WAN connections.
@@ -174,7 +162,7 @@ config HDLC_RAW
          If unsure, say N.
 
 config HDLC_RAW_ETH
-       bool "Raw HDLC Ethernet device support"
+       tristate "Raw HDLC Ethernet device support"
        depends on HDLC
        help
          Generic HDLC driver supporting raw HDLC Ethernet device emulation
@@ -185,7 +173,7 @@ config HDLC_RAW_ETH
          If unsure, say N.
 
 config HDLC_CISCO
-       bool "Cisco HDLC support"
+       tristate "Cisco HDLC support"
        depends on HDLC
        help
          Generic HDLC driver supporting Cisco HDLC over WAN connections.
@@ -193,7 +181,7 @@ config HDLC_CISCO
          If unsure, say N.
 
 config HDLC_FR
-       bool "Frame Relay support"
+       tristate "Frame Relay support"
        depends on HDLC
        help
          Generic HDLC driver supporting Frame Relay over WAN connections.
@@ -201,7 +189,7 @@ config HDLC_FR
          If unsure, say N.
 
 config HDLC_PPP
-       bool "Synchronous Point-to-Point Protocol (PPP) support"
+       tristate "Synchronous Point-to-Point Protocol (PPP) support"
        depends on HDLC
        help
          Generic HDLC driver supporting PPP over WAN connections.
@@ -209,7 +197,7 @@ config HDLC_PPP
          If unsure, say N.
 
 config HDLC_X25
-       bool "X.25 protocol support"
+       tristate "X.25 protocol support"
        depends on HDLC && (LAPB=m && HDLC=m || LAPB=y)
        help
          Generic HDLC driver supporting X.25 over WAN connections.