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

[safe/jmp/linux-2.6] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 495a39a..ab95d3a 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1787,6 +1787,11 @@ and is between 256 and 4096 characters. It is defined in the file
                        waiting for the ACK, so if this is set too high
                        interrupts *may* be lost!
 
+       omap_mux=       [OMAP] Override bootloader pin multiplexing.
+                       Format: <mux_mode0.mode_name=value>...
+                       For example, to override I2C bus2:
+                       omap_mux=i2c2_scl.i2c2_scl=0x100,i2c2_sda.i2c2_sda=0x100
+
        opl3=           [HW,OSS]
                        Format: <io>
 
@@ -2663,6 +2668,8 @@ and is between 256 and 4096 characters. It is defined in the file
                        to a common usb-storage quirk flag as follows:
                                a = SANE_SENSE (collect more than 18 bytes
                                        of sense data);
+                               b = BAD_SENSE (don't collect more than 18
+                                       bytes of sense data);
                                c = FIX_CAPACITY (decrease the reported
                                        device capacity by one sector);
                                h = CAPACITY_HEURISTICS (decrease the
@@ -2747,6 +2754,15 @@ and is between 256 and 4096 characters. It is defined in the file
                        Default is 1, i.e. UTF-8 mode is enabled for all
                        newly opened terminals.
 
+       vt.global_cursor_default=
+                       [VT]
+                       Format=<-1|0|1>
+                       Set system-wide default for whether a cursor
+                       is shown on new VTs. Default is -1,
+                       i.e. cursors will be created by default unless
+                       overridden by individual drivers. 0 will hide
+                       cursors, 1 will display them.
+
        waveartist=     [HW,OSS]
                        Format: <io>,<irq>,<dma>,<dma2>