aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-05-03 14:42:52 -0400
committerWim Van Sebroeck <wim@iguana.be>2010-05-25 05:05:34 -0400
commit4724ba575ea73431aba8a48be6f5a382c470418d (patch)
tree7d3a6fdabfede731cdd040072768b66f170fc805 /Documentation/kernel-parameters.txt
parent8b18085a92c72fe1754481890e9dfc600e736b1f (diff)
watchdog: update/improve/consolidate watchdog driver
Move the limited watchdog driver help from kernel-parameters.txt to Documentation/watchdog/watchdog-parameters.txt and add info to it for all watchdog drivers except the ones that have driver-specific files already. Correct minor comments and MODULE_PARM_DESC() text in 2 places. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt15
1 files changed, 4 insertions, 11 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index f5fce483930c..b56ea860da21 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -290,9 +290,6 @@ and is between 256 and 4096 characters. It is defined in the file
290 advansys= [HW,SCSI] 290 advansys= [HW,SCSI]
291 See header of drivers/scsi/advansys.c. 291 See header of drivers/scsi/advansys.c.
292 292
293 advwdt= [HW,WDT] Advantech WDT
294 Format: <iostart>,<iostop>
295
296 aedsp16= [HW,OSS] Audio Excel DSP 16 293 aedsp16= [HW,OSS] Audio Excel DSP 16
297 Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq> 294 Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq>
298 See also header of sound/oss/aedsp16.c. 295 See also header of sound/oss/aedsp16.c.
@@ -765,9 +762,6 @@ and is between 256 and 4096 characters. It is defined in the file
765 This option is obsoleted by the "netdev=" option, which 762 This option is obsoleted by the "netdev=" option, which
766 has equivalent usage. See its documentation for details. 763 has equivalent usage. See its documentation for details.
767 764
768 eurwdt= [HW,WDT] Eurotech CPU-1220/1410 onboard watchdog.
769 Format: <io>[,<irq>]
770
771 failslab= 765 failslab=
772 fail_page_alloc= 766 fail_page_alloc=
773 fail_make_request=[KNL] 767 fail_make_request=[KNL]
@@ -2267,9 +2261,6 @@ and is between 256 and 4096 characters. It is defined in the file
2267 2261
2268 sched_debug [KNL] Enables verbose scheduler debug messages. 2262 sched_debug [KNL] Enables verbose scheduler debug messages.
2269 2263
2270 sc1200wdt= [HW,WDT] SC1200 WDT (watchdog) driver
2271 Format: <io>[,<timeout>[,<isapnp>]]
2272
2273 scsi_debug_*= [SCSI] 2264 scsi_debug_*= [SCSI]
2274 See drivers/scsi/scsi_debug.c. 2265 See drivers/scsi/scsi_debug.c.
2275 2266
@@ -2858,8 +2849,10 @@ and is between 256 and 4096 characters. It is defined in the file
2858 wd7000= [HW,SCSI] 2849 wd7000= [HW,SCSI]
2859 See header of drivers/scsi/wd7000.c. 2850 See header of drivers/scsi/wd7000.c.
2860 2851
2861 wdt= [WDT] Watchdog 2852 watchdog timers [HW,WDT] For information on watchdog timers,
2862 See Documentation/watchdog/wdt.txt. 2853 see Documentation/watchdog/watchdog-parameters.txt
2854 or other driver-specific files in the
2855 Documentation/watchdog/ directory.
2863 2856
2864 x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of 2857 x2apic_phys [X86-64,APIC] Use x2apic physical mode instead of
2865 default x2apic cluster mode on platforms 2858 default x2apic cluster mode on platforms