projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
Documentation
/
kernel-parameters.txt
diff --git
a/Documentation/kernel-parameters.txt
b/Documentation/kernel-parameters.txt
index a2ffd6be0ef79374ed6d90773f77f288fc04103e..3a0009e03d14bae7d9f6ccbf242675b92ce38c26 100644
(file)
--- a/
Documentation/kernel-parameters.txt
+++ b/
Documentation/kernel-parameters.txt
@@
-455,7
+455,7
@@
and is between 256 and 4096 characters. It is defined in the file
[ARM] imx_timer1,OSTS,netx_timer,mpu_timer2,
pxa_timer,timer3,32k_counter,timer0_1
[AVR32] avr32
- [X86-32] pit,hpet,tsc
,vmi-timer
;
+ [X86-32] pit,hpet,tsc;
scx200_hrt on Geode; cyclone on IBM x440
[MIPS] MIPS
[PARISC] cr16