Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 18d7f5bea0772696e9cdfb09e64327503195d56f..82b42c958d1c7def4eac5c9931a0e8a6f9aab6c6 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1054,6 +1054,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        the driver will use only 32-bit accessors to read/write
                        the device registers.
 
+               meson,<addr>
+                       Start an early, polled-mode console on a meson serial
+                       port at the specified address. The serial port must
+                       already be setup and configured. Options are not yet
+                       supported.
+
                msm_serial,<addr>
                        Start an early, polled-mode console on an msm serial
                        port at the specified address. The serial port
@@ -2959,11 +2965,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                for broken drivers that don't call it.
                skip_isa_align  [X86] do not align io start addr, so can
                                handle more pci cards
-               firmware        [ARM] Do not re-enumerate the bus but instead
-                               just use the configuration from the
-                               bootloader. This is currently used on
-                               IXP2000 systems where the bus has to be
-                               configured a certain way for adjunct CPUs.
                noearly         [X86] Don't do any early type 1 scanning.
                                This might help on some broken boards which
                                machine check when some devices' config space