Merge branch 'x86/debug' into x86/cpu

[linux-2.6-omap-h63xx.git] / drivers / net / hamradio / Kconfig

diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 896aa02000d73079fc1ebda3b222c90cdfe3531e..62d5d5cfd6a60de74a241d4ad76bf1cfbc03e600 100644 (file)
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -64,7 +64,7 @@ config DMASCC
          dmascc. If you don't pass any parameter to the driver, all
          possible I/O addresses are probed. This could irritate other devices
          that are currently not in use. You may specify the list of addresses
          dmascc. If you don't pass any parameter to the driver, all
          possible I/O addresses are probed. This could irritate other devices
          that are currently not in use. You may specify the list of addresses

-         to be probed by "dmascc=addr1,addr2,..." (when compiled into the
+         to be probed by "dmascc.io=addr1,addr2,..." (when compiled into the

          kernel image) or "io=addr1,addr2,..." (when loaded as a module). The
          network interfaces will be called dmascc0 and dmascc1 for the board
          detected first, dmascc2 and dmascc3 for the second one, and so on.
          kernel image) or "io=addr1,addr2,..." (when loaded as a module). The
          network interfaces will be called dmascc0 and dmascc1 for the board
          detected first, dmascc2 and dmascc3 for the second one, and so on.


@@ -113,7 +113,7 @@ config SCC_TRXECHO
 
 config BAYCOM_SER_FDX
        tristate "BAYCOM ser12 fullduplex driver for AX.25"
 
 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
        select CRC_CCITT
        ---help---
          This is one of two drivers for Baycom style simple amateur radio


@@ -133,14 +133,14 @@ config BAYCOM_SER_FDX
 
 config BAYCOM_SER_HDX
        tristate "BAYCOM ser12 halfduplex driver for AX.25"
 
 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
        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
          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
          the driver, use the sethdlc utility available in the standard ax25
          utilities package. For information on the modems, see
          <http://www.baycom.de/> and


@@ -181,7 +181,7 @@ config BAYCOM_EPP
 
 config YAM
        tristate "YAM driver for AX.25"
 
 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
        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


@@ -190,3 +190,4 @@ config YAM
          To compile this driver as a module, choose M here: the module
          will be called yam.
 
          To compile this driver as a module, choose M here: the module
          will be called yam.
 

+