diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
| commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
| tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /net/ipv4/ipconfig.c | |
| parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -rw-r--r-- | net/ipv4/ipconfig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 0b859d46ea74..0f42d1c1f690 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
| @@ -1408,7 +1408,7 @@ late_initcall(ip_auto_config); | |||
| 1408 | 1408 | ||
| 1409 | /* | 1409 | /* |
| 1410 | * Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel | 1410 | * Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel |
| 1411 | * command line parameter. See Documentation/nfsroot.txt. | 1411 | * command line parameter. See Documentation/filesystems/nfsroot.txt. |
| 1412 | */ | 1412 | */ |
| 1413 | static int __init ic_proto_name(char *name) | 1413 | static int __init ic_proto_name(char *name) |
| 1414 | { | 1414 | { |