diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/Kconfig | 8 | ||||
| -rw-r--r-- | net/ipv4/ipconfig.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 9c7e5ffb223d..4670683b4688 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
| @@ -160,7 +160,7 @@ config IP_PNP_DHCP | |||
| 160 | 160 | ||
| 161 | If unsure, say Y. Note that if you want to use DHCP, a DHCP server | 161 | If unsure, say Y. Note that if you want to use DHCP, a DHCP server |
| 162 | must be operating on your network. Read | 162 | must be operating on your network. Read |
| 163 | <file:Documentation/nfsroot.txt> for details. | 163 | <file:Documentation/filesystems/nfsroot.txt> for details. |
| 164 | 164 | ||
| 165 | config IP_PNP_BOOTP | 165 | config IP_PNP_BOOTP |
| 166 | bool "IP: BOOTP support" | 166 | bool "IP: BOOTP support" |
| @@ -175,7 +175,7 @@ config IP_PNP_BOOTP | |||
| 175 | does BOOTP itself, providing all necessary information on the kernel | 175 | does BOOTP itself, providing all necessary information on the kernel |
| 176 | command line, you can say N here. If unsure, say Y. Note that if you | 176 | command line, you can say N here. If unsure, say Y. Note that if you |
| 177 | want to use BOOTP, a BOOTP server must be operating on your network. | 177 | want to use BOOTP, a BOOTP server must be operating on your network. |
| 178 | Read <file:Documentation/nfsroot.txt> for details. | 178 | Read <file:Documentation/filesystems/nfsroot.txt> for details. |
| 179 | 179 | ||
| 180 | config IP_PNP_RARP | 180 | config IP_PNP_RARP |
| 181 | bool "IP: RARP support" | 181 | bool "IP: RARP support" |
| @@ -187,8 +187,8 @@ config IP_PNP_RARP | |||
| 187 | discovered automatically at boot time using the RARP protocol (an | 187 | discovered automatically at boot time using the RARP protocol (an |
| 188 | older protocol which is being obsoleted by BOOTP and DHCP), say Y | 188 | older protocol which is being obsoleted by BOOTP and DHCP), say Y |
| 189 | here. Note that if you want to use RARP, a RARP server must be | 189 | here. Note that if you want to use RARP, a RARP server must be |
| 190 | operating on your network. Read <file:Documentation/nfsroot.txt> for | 190 | operating on your network. Read |
| 191 | details. | 191 | <file:Documentation/filesystems/nfsroot.txt> for details. |
| 192 | 192 | ||
| 193 | # not yet ready.. | 193 | # not yet ready.. |
| 194 | # bool ' IP: ARP support' CONFIG_IP_PNP_ARP | 194 | # bool ' IP: ARP support' CONFIG_IP_PNP_ARP |
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 7c992fbbc2c3..4824fe8996bf 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
| @@ -1411,7 +1411,7 @@ late_initcall(ip_auto_config); | |||
| 1411 | 1411 | ||
| 1412 | /* | 1412 | /* |
| 1413 | * Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel | 1413 | * Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel |
| 1414 | * command line parameter. See Documentation/nfsroot.txt. | 1414 | * command line parameter. See Documentation/filesystems/nfsroot.txt. |
| 1415 | */ | 1415 | */ |
| 1416 | static int __init ic_proto_name(char *name) | 1416 | static int __init ic_proto_name(char *name) |
| 1417 | { | 1417 | { |
