Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e53dd083be96a3272df16a675f14c8396cb744ec
Commit:     e53dd083be96a3272df16a675f14c8396cb744ec
Parent:     c2f828977ba5d17c13debba374ea252d18e5ccfb
Author:     Mauro Carvalho Chehab <[EMAIL PROTECTED]>
AuthorDate: Sat Sep 15 07:38:47 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Mon Sep 17 19:54:26 2007 -0300

    Revert "V4L/DVB (6173a): Documentation: Remove reference to dead "cpia_pp=" 
boot-time option"
    
    This reverts commit 4730d3af625b532e3df5f091b5c8edb08f512fbf.
    
    Unfortunately, patch got mangled by a whitespace removal script.
    
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 Documentation/kernel-parameters.txt |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Documentation/kernel-parameters.txt 
b/Documentation/kernel-parameters.txt
index 586b6f8..b41cde3 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1,5 +1,5 @@
-                         Kernel Parameters
-                         ~~~~~~~~~~~~~~~~~
+                          Kernel Parameters
+                          ~~~~~~~~~~~~~~~~~
 
 The following is a consolidated list of the kernel parameters as implemented
 (mostly) by the __setup() macro and sorted into English Dictionary order
@@ -468,6 +468,9 @@ and is between 256 and 4096 characters. It is defined in 
the file
                        Format:
                        <first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]
 
+       cpia_pp=        [HW,PPT]
+                       Format: { parport<nr> | auto | none }
+
        [EMAIL PROTECTED]
                        [KNL] Reserve a chunk of physical memory to
                        hold a kernel to switch to with kexec on panic.
@@ -1462,7 +1465,7 @@ and is between 256 and 4096 characters. It is defined in 
the file
 
        reboot=         [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
                        Format: <reboot_mode>[,<reboot_mode2>[,...]]
-                       See arch/*/kernel/reboot.c or arch/*/kernel/process.c
+                       See arch/*/kernel/reboot.c or arch/*/kernel/process.c   
                
 
        reserve=        [KNL,BUGS] Force the kernel to ignore some iomem area
 
@@ -1550,12 +1553,12 @@ and is between 256 and 4096 characters. It is defined 
in the file
 
        selinux_compat_net =
                        [SELINUX] Set initial selinux_compat_net flag value.
-                       Format: { "0" | "1" }
-                       0 -- use new secmark-based packet controls
-                       1 -- use legacy packet controls
-                       Default value is 0 (preferred).
-                       Value can be changed at runtime via
-                       /selinux/compat_net.
+                        Format: { "0" | "1" }
+                        0 -- use new secmark-based packet controls
+                        1 -- use legacy packet controls
+                        Default value is 0 (preferred).
+                        Value can be changed at runtime via
+                        /selinux/compat_net.
 
        serialnumber    [BUGS=X86-32]
 
@@ -1954,7 +1957,7 @@ and is between 256 and 4096 characters. It is defined in 
the file
        norandmaps      Don't use address space randomization
                        Equivalent to echo 0 > 
/proc/sys/kernel/randomize_va_space
 
-       unwind_debug=N  N > 0 will enable dwarf2 unwinder debugging
+       unwind_debug=N  N > 0 will enable dwarf2 unwinder debugging
                        This is useful to get more information why
                        you got a "dwarf2 unwinder stuck"
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to