diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /net/ipv4/ipconfig.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
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 2b097752426b..cbff2ecccf3d 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
| @@ -1444,7 +1444,7 @@ static int __init ip_auto_config(void) | |||
| 1444 | root_server_addr = addr; | 1444 | root_server_addr = addr; |
| 1445 | 1445 | ||
| 1446 | /* | 1446 | /* |
| 1447 | * Use defaults whereever applicable. | 1447 | * Use defaults wherever applicable. |
| 1448 | */ | 1448 | */ |
| 1449 | if (ic_defaults() < 0) | 1449 | if (ic_defaults() < 0) |
| 1450 | return -1; | 1450 | return -1; |