diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-02 08:31:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-02 08:31:55 -0500 |
| commit | ae2c27a78f1df5b0967069cd3b916cff1eb044c8 (patch) | |
| tree | e67f1012e76185bac2e78bb04caa68ed1f7dc2a2 /drivers/net | |
| parent | a608ab9cb6a5050394498b2520c6e7c162f4e2cf (diff) | |
| parent | e34efe3b100d0fbdf053128956c3dd0bc68754d6 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/hamradio/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig index 896aa02000d7..feb0ada7a025 100644 --- a/drivers/net/hamradio/Kconfig +++ b/drivers/net/hamradio/Kconfig | |||
| @@ -113,7 +113,7 @@ config SCC_TRXECHO | |||
| 113 | 113 | ||
| 114 | config BAYCOM_SER_FDX | 114 | config BAYCOM_SER_FDX |
| 115 | tristate "BAYCOM ser12 fullduplex driver for AX.25" | 115 | tristate "BAYCOM ser12 fullduplex driver for AX.25" |
| 116 | depends on AX25 | 116 | depends on AX25 && !S390 |
| 117 | select CRC_CCITT | 117 | select CRC_CCITT |
| 118 | ---help--- | 118 | ---help--- |
| 119 | This is one of two drivers for Baycom style simple amateur radio | 119 | This is one of two drivers for Baycom style simple amateur radio |
| @@ -133,7 +133,7 @@ config BAYCOM_SER_FDX | |||
| 133 | 133 | ||
| 134 | config BAYCOM_SER_HDX | 134 | config BAYCOM_SER_HDX |
| 135 | tristate "BAYCOM ser12 halfduplex driver for AX.25" | 135 | tristate "BAYCOM ser12 halfduplex driver for AX.25" |
| 136 | depends on AX25 | 136 | depends on AX25 && !S390 |
| 137 | select CRC_CCITT | 137 | select CRC_CCITT |
| 138 | ---help--- | 138 | ---help--- |
| 139 | This is one of two drivers for Baycom style simple amateur radio | 139 | This is one of two drivers for Baycom style simple amateur radio |
| @@ -181,7 +181,7 @@ config BAYCOM_EPP | |||
| 181 | 181 | ||
| 182 | config YAM | 182 | config YAM |
| 183 | tristate "YAM driver for AX.25" | 183 | tristate "YAM driver for AX.25" |
| 184 | depends on AX25 | 184 | depends on AX25 && !S390 |
| 185 | help | 185 | help |
| 186 | The YAM is a modem for packet radio which connects to the serial | 186 | The YAM is a modem for packet radio which connects to the serial |
| 187 | port and includes some of the functions of a Terminal Node | 187 | port and includes some of the functions of a Terminal Node |