VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / net / wan / Kconfig

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 2baf40a..03eeaeb 100644 (file)
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -57,119 +57,6 @@ config COSA
          The driver will be compiled as a module: the
          module will be called cosa.
 
          The driver will be compiled as a module: the
          module will be called cosa.
 

-#
-# COMX drivers
-#
-# Not updated to 2.6.
-config COMX
-       tristate "MultiGate (COMX) synchronous serial boards support"
-       depends on WAN && (ISA || PCI) && BROKEN
-       ---help---
-         Drivers for the PC synchronous serial adapters by
-         ITConsult-Pro Co, Hungary.
-
-         Read <file:Documentation/networking/comx.txt> for help on configuring
-         and using COMX interfaces. Further info on these cards can be found
-         at <http://www.itc.hu/> or <info@itc.hu>.
-
-         Say Y if you want to use any board from the MultiGate (COMX)
-         family, you must also say Y to "/proc file system support"
-         (CONFIG_PROC_FS) in order to use these drivers.
-
-         To compile this driver as a module, choose M here: the
-         module will be called comx.
-
-config COMX_HW_COMX
-       tristate "Support for COMX/CMX/HiCOMX boards"
-       depends on COMX
-       help
-         Driver for the 'CMX', 'COMX' and 'HiCOMX' boards.
-
-         You will need additional firmware to use these cards, which are
-         downloadable from <ftp://ftp.itc.hu/>.
-
-         Say Y if you have a board like this.
-
-         To compile this driver as a module, choose M here: the
-         module will be called comx-hw-comx.
-
-config COMX_HW_LOCOMX
-       tristate "Support for LoCOMX board"
-       depends on COMX
-       help
-         Driver for the 'LoCOMX' board.
-
-         Say Y if you have a board like this.
-
-         To compile this driver as a module, choose M here: the
-         module will be called comx-hw-locomx.
-
-config COMX_HW_MIXCOM
-       tristate "Support for MixCOM board"
-       depends on COMX
-       ---help---
-         Driver for the 'MixCOM' board.
-
-         If you want to use the watchdog device on this card, you should
-         select it in the Watchdog Cards section of the Character Devices
-         configuration. The ISDN interface of this card is Teles 16.3
-         compatible, you should enable it in the ISDN configuration menu. The
-         driver for the flash ROM of this card is available separately on
-         <ftp://ftp.itc.hu/>.
-
-         Say Y if you have a board like this.
-
-         To compile this driver as a module, choose M here: the
-         module will be called comx-hw-mixcom.
-
-config COMX_HW_MUNICH
-       tristate "Support for MUNICH based boards: SliceCOM, PCICOM (WelCOM)"
-       depends on COMX
-       ---help---
-         Driver for the 'SliceCOM' (channelized E1) and 'PciCOM' (X21) boards.
-
-         Read <file:Documentation/networking/slicecom.txt> for help on
-         configuring and using SliceCOM interfaces. Further info on these
-         cards can be found at <http://www.itc.hu> or <info@itc.hu>.
-
-         Say Y if you have a board like this.
-
-         To compile this driver as a module, choose M here: the
-         module will be called comx-hw-munich.
-
-config COMX_PROTO_PPP
-       tristate "Support for HDLC and syncPPP protocols on MultiGate boards"
-       depends on COMX
-       help
-         Cisco-HDLC and synchronous PPP protocol driver.
-
-         Say Y if you want to use either protocol.
-
-         To compile this as a module, choose M here: the
-         module will be called comx-proto-ppp.
-
-config COMX_PROTO_LAPB
-       tristate "Support for LAPB protocol on MultiGate boards"
-       depends on WAN && (COMX!=n && LAPB=m && LAPB || LAPB=y && COMX)
-       help
-         LAPB protocol driver.
-
-         Say Y if you want to use this protocol.
-
-         To compile this as a module, choose M here: the
-         module will be called comx-proto-lapb.
-
-config COMX_PROTO_FR
-       tristate "Support for Frame Relay on MultiGate boards"
-       depends on COMX
-       help
-         Frame Relay protocol driver.
-
-         Say Y if you want to use this protocol.
-
-         To compile this as a module, choose M here: the
-         module will be called comx-proto-fr.
-

 config DSCC4
        tristate "Etinc PCISYNC serial board support"
        depends on WAN && PCI && m
 config DSCC4
        tristate "Etinc PCISYNC serial board support"
        depends on WAN && PCI && m


@@ -361,7 +248,7 @@ config WANXL
 
 config WANXL_BUILD_FIRMWARE
        bool "rebuild wanXL firmware"
 
 config WANXL_BUILD_FIRMWARE
        bool "rebuild wanXL firmware"

-       depends on WANXL
+       depends on WANXL && !PREVENT_FIRMWARE_BUILD

        help
          Allows you to rebuild firmware run by the QUICC processor.
          It requires as68k, ld68k and hexdump programs.
        help
          Allows you to rebuild firmware run by the QUICC processor.
          It requires as68k, ld68k and hexdump programs.