The patch titled various doc/kernel-parameters fixes has been added to the -mm tree. Its filename is various-doc-kernel-parameters-fixes.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: various doc/kernel-parameters fixes From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> - tell what APIC (by request), MTD, & PARIDE mean - correct some source file names - remove IA64 "llsc*=" (seems to have been removed from source tree) - removel SCSI "53c7xx=" (driver already removed) Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Acked-by: Jesper Juhl <jesper.juhl@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/kernel-parameters.txt | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff -puN Documentation/kernel-parameters.txt~various-doc-kernel-parameters-fixes Documentation/kernel-parameters.txt --- a/Documentation/kernel-parameters.txt~various-doc-kernel-parameters-fixes +++ a/Documentation/kernel-parameters.txt @@ -57,14 +57,14 @@ parameter is applicable: MDA MDA console support is enabled. MOUSE Appropriate mouse support is enabled. MSI Message Signaled Interrupts (PCI). - MTD MTD support is enabled. + MTD MTD (Memory Technology Device) support is enabled. NET Appropriate network support is enabled. NUMA NUMA support is enabled. GENERIC_TIME The generic timeofday code is enabled. NFS Appropriate NFS support is enabled. OSS OSS sound support is enabled. - PV_OPS A paravirtualized kernel - PARIDE The ParIDE subsystem is enabled. + PV_OPS A paravirtualized kernel is enabled. + PARIDE The ParIDE (parallel port IDE) subsystem is enabled. PARISC The PA-RISC architecture is enabled. PCI PCI bus support is enabled. PCMCIA The PCMCIA subsystem is enabled. @@ -122,10 +122,6 @@ and is between 256 and 4096 characters. ./include/asm/setup.h as COMMAND_LINE_SIZE. - 53c7xx= [HW,SCSI] Amiga SCSI controllers - See header of drivers/scsi/53c7xx.c. - See also Documentation/scsi/ncr53c7xx.txt. - acpi= [HW,ACPI,X86-64,i386] Advanced Configuration and Power Interface Format: { force | off | ht | strict | noirq } @@ -279,7 +275,8 @@ and is between 256 and 4096 characters. not play well with APC CPU idle - disable it if you have APC and your system crashes randomly. - apic= [APIC,i386] Change the output verbosity whilst booting + apic= [APIC,i386] Advanced Programmable Interrupt Controller + Change the output verbosity whilst booting Format: { quiet (default) | verbose | debug } Change the amount of debugging information output when initialising the APIC and IO-APIC components. @@ -768,7 +765,8 @@ and is between 256 and 4096 characters. See Documentation/nfsroot.txt. ip2= [HW] Set IO/IRQ pairs for up to 4 IntelliPort boards - See comment before ip2_setup() in drivers/char/ip2.c. + See comment before ip2_setup() in + drivers/char/ip2/ip2base.c. ips= [HW,SCSI] Adaptec / IBM ServeRAID controller See header of drivers/scsi/ips.c. @@ -864,9 +862,6 @@ and is between 256 and 4096 characters. if PNPBIOS or ACPI should describe them. This is for working around firmware defects. - llsc*= [IA64] See function print_params() in - arch/ia64/sn/kernel/llsc4.c. - load_ramdisk= [RAM] List of ramdisks to load from floppy See Documentation/ramdisk.txt. @@ -1039,7 +1034,7 @@ and is between 256 and 4096 characters. <name>,<region-number>[,<base>,<size>,<buswidth>,<altbuswidth>] mtdparts= [MTD] - See drivers/mtd/cmdline.c. + See drivers/mtd/cmdlinepart.c. mtouchusb.raw_coordinates= [HW] Make the MicroTouch USB driver use raw coordinates _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are kernel-doc-fix-for-kmodc.patch update-dontdiff-file.patch kernel-doc-fixes-for-pci-and-drivers-base.patch docbook-add-pipes-other-fixes.patch x86-64-calgary-fix-section-mismatch-warnings-in-tce.patch various-doc-kernel-parameters-fixes.patch git-acpi.patch git-mtd.patch aha152x-in-debug-mode.patch git-unionfs.patch git-ipwireless_cs.patch doc-kernel-parameters-use-x86-32-tag-instead-of-ia-32.patch i2ch-kernel-doc-additions.patch irqh-fix-kernel-doc.patch docbook-bad-file-references.patch kthread-silence-bogus-section-mismatch-warning.patch profile-likely-unlikely-macros.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html