Pull bugzilla-8171 into release branch

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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 6e92ba61f7c0ea18b86557eec2bd17f2ece5d9ca..856c8b114e71698731c93503f19a32bd1b10c481 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -79,6 +79,7 @@ parameter is applicable:
                        Documentation/scsi/.
        SELINUX SELinux support is enabled.
        SERIAL  Serial support is enabled.
                        Documentation/scsi/.
        SELINUX SELinux support is enabled.
        SERIAL  Serial support is enabled.

+       SH      SuperH architecture is enabled.

        SMP     The kernel is an SMP kernel.
        SPARC   Sparc architecture is enabled.
        SWSUSP  Software suspend is enabled.
        SMP     The kernel is an SMP kernel.
        SPARC   Sparc architecture is enabled.
        SWSUSP  Software suspend is enabled.


@@ -125,7 +126,8 @@ and is between 256 and 4096 characters. It is defined in the file
                        See header of drivers/scsi/53c7xx.c.
                        See also Documentation/scsi/ncr53c7xx.txt.
 
                        See header of drivers/scsi/53c7xx.c.
                        See also Documentation/scsi/ncr53c7xx.txt.
 

-       acpi=           [HW,ACPI] Advanced Configuration and Power Interface
+       acpi=           [HW,ACPI,X86-64,i386]
+                       Advanced Configuration and Power Interface

                        Format: { force | off | ht | strict | noirq }
                        force -- enable ACPI if default was off
                        off -- disable ACPI if default was on
                        Format: { force | off | ht | strict | noirq }
                        force -- enable ACPI if default was off
                        off -- disable ACPI if default was on


@@ -485,7 +487,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
        dtc3181e=       [HW,SCSI]
 
 
        dtc3181e=       [HW,SCSI]
 

-       earlyprintk=    [IA-32,X86-64]
+       earlyprintk=    [IA-32,X86-64,SH]

                        earlyprintk=vga
                        earlyprintk=serial[,ttySn[,baudrate]]
 
                        earlyprintk=vga
                        earlyprintk=serial[,ttySn[,baudrate]]
 


@@ -1784,7 +1786,7 @@ and is between 256 and 4096 characters. It is defined in the file
        usbhid.mousepoll=
                        [USBHID] The interval which mice are to be polled at.
 
        usbhid.mousepoll=
                        [USBHID] The interval which mice are to be polled at.
 

-       vdso=           [IA-32]
+       vdso=           [IA-32,SH]

                        vdso=1: enable VDSO (default)
                        vdso=0: disable VDSO mapping
 
                        vdso=1: enable VDSO (default)
                        vdso=0: disable VDSO mapping