diff options
author | Brian Haley <brian.haley@hp.com> | 2010-02-04 16:36:50 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-04 16:36:50 -0500 |
commit | b0f83b280fcfa9cdd66b748f0c12fb26ce69e391 (patch) | |
tree | 620532b58fef2447609b22f1c9d36426cdf09f0d /Documentation | |
parent | 15c052fc7f4a1b3544602be8af77e31bba9261bf (diff) |
doc: document IPv6 parameters
Update documentation to describe IPv6 parameters.
Reported by <greg@enjellic.com>.
Signed-off-by: Brian Haley <brian.haley@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kernel-parameters.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 736d45602886..3ca7f8f56525 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -54,6 +54,7 @@ parameter is applicable: | |||
54 | IMA Integrity measurement architecture is enabled. | 54 | IMA Integrity measurement architecture is enabled. |
55 | IOSCHED More than one I/O scheduler is enabled. | 55 | IOSCHED More than one I/O scheduler is enabled. |
56 | IP_PNP IP DHCP, BOOTP, or RARP is enabled. | 56 | IP_PNP IP DHCP, BOOTP, or RARP is enabled. |
57 | IPV6 IPv6 support is enabled. | ||
57 | ISAPNP ISA PnP code is enabled. | 58 | ISAPNP ISA PnP code is enabled. |
58 | ISDN Appropriate ISDN support is enabled. | 59 | ISDN Appropriate ISDN support is enabled. |
59 | JOY Appropriate joystick support is enabled. | 60 | JOY Appropriate joystick support is enabled. |
@@ -347,6 +348,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
347 | Change the amount of debugging information output | 348 | Change the amount of debugging information output |
348 | when initialising the APIC and IO-APIC components. | 349 | when initialising the APIC and IO-APIC components. |
349 | 350 | ||
351 | autoconf= [IPV6] | ||
352 | See Documentation/networking/ipv6.txt. | ||
353 | |||
350 | show_lapic= [APIC,X86] Advanced Programmable Interrupt Controller | 354 | show_lapic= [APIC,X86] Advanced Programmable Interrupt Controller |
351 | Limit apic dumping. The parameter defines the maximal | 355 | Limit apic dumping. The parameter defines the maximal |
352 | number of local apics being dumped. Also it is possible | 356 | number of local apics being dumped. Also it is possible |
@@ -629,6 +633,12 @@ and is between 256 and 4096 characters. It is defined in the file | |||
629 | See drivers/char/README.epca and | 633 | See drivers/char/README.epca and |
630 | Documentation/serial/digiepca.txt. | 634 | Documentation/serial/digiepca.txt. |
631 | 635 | ||
636 | disable= [IPV6] | ||
637 | See Documentation/networking/ipv6.txt. | ||
638 | |||
639 | disable_ipv6= [IPV6] | ||
640 | See Documentation/networking/ipv6.txt. | ||
641 | |||
632 | disable_mtrr_cleanup [X86] | 642 | disable_mtrr_cleanup [X86] |
633 | The kernel tries to adjust MTRR layout from continuous | 643 | The kernel tries to adjust MTRR layout from continuous |
634 | to discrete, to make X server driver able to add WB | 644 | to discrete, to make X server driver able to add WB |