X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=Documentation%2Fkernel-parameters.txt;h=01ece1b9213e97de22f1cc02faf4f0bae5165e96;hb=d9a1abe4844e7591cd82e167a1a09e6546f6c45e;hp=8b61c93609994dd91e36c25e1b29647ad084eaff;hpb=08861c713c1314d5b7329a290b5d53ad711112c3;p=linux-2.6-microblaze.git diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 8b61c9360999..01ece1b9213e 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1759,7 +1759,7 @@ and is between 256 and 4096 characters. It is defined in the file nousb [USB] Disable the USB subsystem - nowatchdog [KNL] Disable the lockup detector. + nowatchdog [KNL] Disable the lockup detector (NMI watchdog). nowb [ARM]