Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux13...

[linux-2.6] / drivers / net / hamradio / Kconfig

diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index de087cd609d98fcf916c638187ed0df9b0e9eb59..36d2c7d4f4d089ab3e22ab559ef5a00a336a2e16 100644 (file)
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -1,6 +1,7 @@
 config MKISS
        tristate "Serial port KISS driver"
        depends on AX25
+       select CRC16
        ---help---
          KISS is a protocol used for the exchange of data between a computer
          and a Terminal Node Controller (a small embedded system commonly
@@ -112,7 +113,7 @@ config SCC_TRXECHO
 
 config BAYCOM_SER_FDX
        tristate "BAYCOM ser12 fullduplex driver for AX.25"
-       depends on AX25
+       depends on AX25 && !S390
        select CRC_CCITT
        ---help---
          This is one of two drivers for Baycom style simple amateur radio
@@ -132,14 +133,14 @@ config BAYCOM_SER_FDX
 
 config BAYCOM_SER_HDX
        tristate "BAYCOM ser12 halfduplex driver for AX.25"
-       depends on AX25
+       depends on AX25 && !S390
        select CRC_CCITT
        ---help---
          This is one of two drivers for Baycom style simple amateur radio
          modems that connect to a serial interface. The driver supports the
-         ser12 design in full-duplex mode. This is the old driver.  It is
+         ser12 design in half-duplex mode. This is the old driver.  It is
          still provided in case your serial interface chip does not work with
-         the full-duplex driver. This driver is depreciated.  To configure
+         the full-duplex driver. This driver is deprecated.  To configure
          the driver, use the sethdlc utility available in the standard ax25
          utilities package. For information on the modems, see
          <http://www.baycom.de/> and
@@ -180,7 +181,7 @@ config BAYCOM_EPP
 
 config YAM
        tristate "YAM driver for AX.25"
-       depends on AX25
+       depends on AX25 && !S390
        help
          The YAM is a modem for packet radio which connects to the serial
          port and includes some of the functions of a Terminal Node
@@ -189,3 +190,4 @@ config YAM
          To compile this driver as a module, choose M here: the module
          will be called yam.
 
+