Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 0e90453..b69cfdc 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -70,7 +70,6 @@ parameter is applicable:
        M68k    M68k architecture is enabled.
                        These options have more detailed description inside of
                        Documentation/m68k/kernel-options.txt.
-       MCA     MCA bus support is enabled.
        MDA     MDA console support is enabled.
        MIPS    MIPS architecture is enabled.
        MOUSE   Appropriate mouse support is enabled.
@@ -110,6 +109,7 @@ parameter is applicable:
        USB     USB support is enabled.
        USBHID  USB Human Interface Device support is enabled.
        V4L     Video For Linux support is enabled.
+       VMMIO   Driver for memory mapped virtio devices is enabled.
        VGA     The VGA console has been enabled.
        VT      Virtual terminal support is enabled.
        WDT     Watchdog support is enabled.
@@ -610,7 +610,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        ddebug_query=   [KNL,DYNAMIC_DEBUG] Enable debug messages at early boot
                        time. See Documentation/dynamic-debug-howto.txt for
-                       details.
+                       details.  Deprecated, see dyndbg.
 
        debug           [KNL] Enable kernel debugging (events log level).
 
@@ -730,6 +730,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        dscc4.setup=    [NET]
 
+       dyndbg[="val"]          [KNL,DYNAMIC_DEBUG]
+       module.dyndbg[="val"]
+                       Enable debug messages at boot time.  See
+                       Documentation/dynamic-debug-howto.txt for details.
+
        earlycon=       [KNL] Output early console device and options.
                uart[8250],io,<addr>[,options]
                uart[8250],mmio,<addr>[,options]
@@ -982,6 +987,20 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        i8k.restricted  [HW] Allow controlling fans only if SYS_ADMIN
                        capability is set.
 
+       i915.invert_brightness=
+                       [DRM] Invert the sense of the variable that is used to
+                       set the brightness of the panel backlight. Normally a
+                       brightness value of 0 indicates backlight switched off,
+                       and the maximum of the brightness value sets the backlight
+                       to maximum brightness. If this parameter is set to 0
+                       (default) and the machine requires it, or this parameter
+                       is set to 1, a brightness value of 0 sets the backlight
+                       to maximum brightness, and the maximum of the brightness
+                       value switches the backlight off.
+                       -1 -- never invert brightness
+                        0 -- machine default
+                        1 -- force brightness inversion
+
        icn=            [HW,ISDN]
                        Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
 
@@ -2457,6 +2476,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        resume=         [SWSUSP]
                        Specify the partition device for software suspend
+                       Format:
+                       {/dev/<dev> | PARTUUID=<uuid> | <int>:<int> | <hex>}
 
        resume_offset=  [SWSUSP]
                        Specify the offset from the beginning of the partition
@@ -2932,6 +2953,22 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        video=          [FB] Frame buffer configuration
                        See Documentation/fb/modedb.txt.
 
+       virtio_mmio.device=
+                       [VMMIO] Memory mapped virtio (platform) device.
+
+                               <size>@<baseaddr>:<irq>[:<id>]
+                       where:
+                               <size>     := size (can use standard suffixes
+                                               like K, M and G)
+                               <baseaddr> := physical base address
+                               <irq>      := interrupt number (as passed to
+                                               request_irq())
+                               <id>       := (optional) platform device id
+                       example:
+                               virtio_mmio.device=1K@0x100b0000:48:7
+
+                       Can be used multiple times for multiple devices.
+
        vga=            [BOOT,X86-32] Select a particular video mode
                        See Documentation/x86/boot.txt and
                        Documentation/svga.txt.