diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-07-20 14:26:47 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-07-20 14:26:47 -0400 |
| commit | c36c282b88963d0957368a443168588e62301fda (patch) | |
| tree | 6343887ae42a65635a61b4ad99fd7f3e8dd24758 /Documentation/kernel-parameters.txt | |
| parent | f4fbfb0dda5577075a049eec7fb7ad38abca1912 (diff) | |
| parent | 1f564ad6d4182859612cbae452122e5eb2d62a76 (diff) | |
Pull ia64-clocksource into release branch
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 854744bde224..5fbe07706ae9 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1154,6 +1154,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1154 | 1154 | ||
| 1155 | nointroute [IA-64] | 1155 | nointroute [IA-64] |
| 1156 | 1156 | ||
| 1157 | nojitter [IA64] Disables jitter checking for ITC timers. | ||
| 1158 | |||
| 1157 | nolapic [IA-32,APIC] Do not enable or use the local APIC. | 1159 | nolapic [IA-32,APIC] Do not enable or use the local APIC. |
| 1158 | 1160 | ||
| 1159 | nolapic_timer [IA-32,APIC] Do not use the local APIC timer. | 1161 | nolapic_timer [IA-32,APIC] Do not use the local APIC timer. |