Merge with Linux 2.4.0-test3-pre8. Linus has accepted most of what

I've sent him, so we're very close to full integration of the MIPS
port into his sources.

1 files changed, 7 insertions, 7 deletions

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index c7ee9aa5f..9a7ee4a2b 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -4318,12 +4318,10 @@ CONFIG_DMASCC
   modem), in order to send and receive AX.25 packet radio network
   traffic.
 
-  Currently, this driver supports Ottawa PI/PI2
-  (http://hydra.carleton.ca/info/pi2.html ) and Gracilis PackeTwin
-  (http://www.paccomm.com/gracilis.html ) boards. They are detected
-  automatically. If you have one of these cards, say Y here and read
-  the AX25-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto .
+  Currently, this driver supports Ottawa PI/PI2, Paccomm/Gracilis
+  PackeTwin, and S5SCC/DMA boards. They are detected automatically.
+  If you have one of these cards, say Y here and read the AX25-HOWTO,
+  available from http://www.linuxdoc.org/docs.html#howto .
 
   This driver can operate multiple boards simultaneously. If you
   compile it as a module (by saying M instead of Y), it will be called
@@ -4339,7 +4337,9 @@ CONFIG_DMASCC
   certain parameters, such as channel access timing, clock mode, and
   DMA channel. This is accomplished with a small utility program,
   dmascc_cfg, available at
-  http://www.nt.tuwien.ac.at/~kkudielk/Linux/ .
+  http://www.nt.tuwien.ac.at/~kkudielk/Linux/ . Please be sure to get
+  at least version 1.27 of dmascc_cfg, as older versions will not
+  work with the current driver.
 
 Z8530 SCC driver for AX.25
 CONFIG_SCC