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 e275432..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.
        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.
        MDA     MDA console support is enabled.
        MIPS    MIPS architecture is enabled.
        MOUSE   Appropriate mouse support is enabled.


@@ -611,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
 
        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).
 
 
        debug           [KNL] Enable kernel debugging (events log level).
 


@@ -731,6 +730,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        dscc4.setup=    [NET]
 
 
        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]
        earlycon=       [KNL] Output early console device and options.
                uart[8250],io,<addr>[,options]
                uart[8250],mmio,<addr>[,options]


@@ -983,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.
 
        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>]]]
 
        icn=            [HW,ISDN]
                        Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
 


@@ -2458,6 +2476,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        resume=         [SWSUSP]
                        Specify the partition device for software suspend
 
        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
 
        resume_offset=  [SWSUSP]
                        Specify the offset from the beginning of the partition