Merge branches 'x86-fixes-for-linus' and 'x86-uv-for-linus' of git://git.kernel.org...

[mv-sheeva.git] / drivers / net / hamradio / Kconfig

diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 36d2c7d4f4d089ab3e22ab559ef5a00a336a2e16..95dbcfdf131dd73d4bd9ce54ceb85ffde253f7ee 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.


@@ -73,7 +73,7 @@ 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
          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://cacofonix.nt.tuwien.ac.at/~oe1kib/Linux/>. Please be sure to
+         <http://www.linux-ax25.org/wiki/Ax25-tools>. Please be sure to

          get at least version 1.27 of dmascc_cfg, as older versions will not
          work with the current driver.
 
          get at least version 1.27 of dmascc_cfg, as older versions will not
          work with the current driver.