Merge master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 883cf7da10fcb0f41ab9e4f5fd16626213f7a620..b5328b0ff927d6b063815a81aea7c388b2241e58 100644 (file)
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -410,103 +410,6 @@ config WAN_ROUTER_DRIVERS
 
          If unsure, say N.
 
-config VENDOR_SANGOMA
-       tristate "Sangoma WANPIPE(tm) multiprotocol cards"
-       depends on WAN_ROUTER_DRIVERS && WAN_ROUTER && (PCI || ISA) && BROKEN
-       ---help---
-         Driver for S514-PCI/ISA Synchronous Data Link Adapters (SDLA).
-
-         WANPIPE from Sangoma Technologies Inc. <http://www.sangoma.com/>
-         is a family of intelligent multiprotocol WAN adapters with data
-         transfer rates up to 4Mbps. Cards support:
-
-         - X.25, Frame Relay, PPP, Cisco HDLC protocols.
-
-         - API for protocols like HDLC (LAPB), HDLC Streaming, X.25,
-         Frame Relay and BiSync.
-
-         - Ethernet Bridging over Frame Relay protocol.
-
-         - MULTILINK PPP
-
-         - Async PPP (Modem Dialup)
-
-         The next questions will ask you about the protocols you want
-         the driver to support.
-
-         If you have one or more of these cards, say M to this option;
-         and read <file:Documentation/networking/wan-router.txt>.
-
-         To compile this driver as a module, choose M here: the
-         module will be called wanpipe.
-
-config WANPIPE_CHDLC
-       bool "WANPIPE Cisco HDLC support"
-       depends on VENDOR_SANGOMA
-       ---help---
-         Connect a WANPIPE card to a leased line using the Cisco HDLC.
-
-         - Supports Dual Port Cisco HDLC on the S514-PCI/S508-ISA cards
-         which allows user to build applications using the HDLC streaming API.
-
-         - CHDLC Streaming MULTILINK PPP that can bind multiple WANPIPE T1
-         cards into a single logical channel.
-
-         Say Y and the Cisco HDLC support, HDLC streaming API and
-         MULTILINK PPP will be included in the driver.
-
-config WANPIPE_FR
-       bool "WANPIPE Frame Relay support"
-       depends on VENDOR_SANGOMA
-       help
-         Connect a WANPIPE card to a Frame Relay network, or use Frame Relay
-         API to develop custom applications.
-
-         Contains the Ethernet Bridging over Frame Relay feature, where
-         a WANPIPE frame relay link can be directly connected to the Linux
-         kernel bridge. The Frame Relay option is supported on S514-PCI
-         and S508-ISA cards.
-
-         Say Y and the Frame Relay support will be included in the driver.
-
-config WANPIPE_X25
-       bool "WANPIPE X.25 support"
-       depends on VENDOR_SANGOMA
-       help
-         Connect a WANPIPE card to an X.25 network.
-
-         Includes the X.25 API support for custom applications over the
-         X.25 protocol. The X.25 option is supported on S514-PCI and
-         S508-ISA cards.
-
-         Say Y and the X.25 support will be included in the driver.
-
-config WANPIPE_PPP
-       bool "WANPIPE PPP support"
-       depends on VENDOR_SANGOMA
-       help
-         Connect a WANPIPE card to a leased line using Point-to-Point
-         Protocol (PPP).
-
-         The PPP option is supported on S514-PCI/S508-ISA cards.
-
-         Say Y and the PPP support will be included in the driver.
-
-config WANPIPE_MULTPPP
-       bool "WANPIPE Multi-Port PPP support"
-       depends on VENDOR_SANGOMA
-       help
-         Connect a WANPIPE card to a leased line using Point-to-Point
-         Protocol (PPP).
-
-         Uses in-kernel SyncPPP protocol over the Sangoma HDLC Streaming
-         adapter. In this case each Sangoma adapter port can support an
-         independent PPP connection. For example, a single Quad-Port PCI
-         adapter can support up to four independent PPP links. The PPP
-         option is supported on S514-PCI/S508-ISA cards.
-
-         Say Y and the Multi-Port PPP support will be included in the driver.
-
 config CYCLADES_SYNC
        tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)"
        depends on WAN_ROUTER_DRIVERS && (PCI || ISA)