aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-10-19 18:11:36 -0400
committerAdrian Bunk <bunk@kernel.org>2007-10-19 18:11:36 -0400
commit646b1c9dad52f3ab17e4e44b2bb7f24aad956db6 (patch)
tree6ab256acf85319970f6a45fccda6f8d026cbe4d2
parent30afddadac9b3423912e7729b5dec17d638e415f (diff)
Documentation: Fix erroneous "dmascc=" documentation
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
-rw-r--r--Documentation/kernel-parameters.txt4
-rw-r--r--drivers/net/hamradio/Kconfig2
2 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 3ea49f98d405..c80ad89080b8 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -564,10 +564,6 @@ and is between 256 and 4096 characters. It is defined in the file
564 See drivers/char/README.epca and 564 See drivers/char/README.epca and
565 Documentation/digiepca.txt. 565 Documentation/digiepca.txt.
566 566
567 dmascc= [HW,AX25,SERIAL] AX.25 Z80SCC driver with DMA
568 support available.
569 Format: <io_dev0>[,<io_dev1>[,..<io_dev32>]]
570
571 dmasound= [HW,OSS] Sound subsystem buffers 567 dmasound= [HW,OSS] Sound subsystem buffers
572 568
573 dscc4.setup= [NET] 569 dscc4.setup= [NET]
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 36d2c7d4f4d0..62d5d5cfd6a6 100644
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -64,7 +64,7 @@ config DMASCC
64 dmascc. If you don't pass any parameter to the driver, all 64 dmascc. If you don't pass any parameter to the driver, all
65 possible I/O addresses are probed. This could irritate other devices 65 possible I/O addresses are probed. This could irritate other devices
66 that are currently not in use. You may specify the list of addresses 66 that are currently not in use. You may specify the list of addresses
67 to be probed by "dmascc=addr1,addr2,..." (when compiled into the 67 to be probed by "dmascc.io=addr1,addr2,..." (when compiled into the
68 kernel image) or "io=addr1,addr2,..." (when loaded as a module). The 68 kernel image) or "io=addr1,addr2,..." (when loaded as a module). The
69 network interfaces will be called dmascc0 and dmascc1 for the board 69 network interfaces will be called dmascc0 and dmascc1 for the board
70 detected first, dmascc2 and dmascc3 for the second one, and so on. 70 detected first, dmascc2 and dmascc3 for the second one, and so on.