diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-06-23 16:20:51 -0400 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-06-23 16:20:51 -0400 |
| commit | 74d83b7eedab14e4b963a2220ff76f98fa6d4cb8 (patch) | |
| tree | ff4b10ebd9cf1a057c4b1a703732858a539faff7 /include/linux/uts.h | |
| parent | 61db1802bf33bf027cd97ba3f79566b2b2fce5c6 (diff) | |
| parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) | |
Merge tag 'v3.0-rc4' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'include/linux/uts.h')
| -rw-r--r-- | include/linux/uts.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/uts.h b/include/linux/uts.h index 73eb1ed36ec4..6ddbd86377de 100644 --- a/include/linux/uts.h +++ b/include/linux/uts.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | #ifndef UTS_NODENAME | 11 | #ifndef UTS_NODENAME |
| 12 | #define UTS_NODENAME "(none)" /* set by sethostname() */ | 12 | #define UTS_NODENAME CONFIG_DEFAULT_HOSTNAME /* set by sethostname() */ |
| 13 | #endif | 13 | #endif |
| 14 | 14 | ||
| 15 | #ifndef UTS_DOMAINNAME | 15 | #ifndef UTS_DOMAINNAME |