diff options
| author | James Morris <jmorris@namei.org> | 2011-06-30 12:43:56 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-06-30 12:43:56 +0400 |
| commit | 5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch) | |
| tree | 9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /include/linux/uts.h | |
| parent | 0e4ae0e0dec634b2ae53ac57d14141b140467dbe (diff) | |
| parent | c017d0d1351f916c0ced3f358afc491fdcf490b4 (diff) | |
| download | linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.tar.xz | |
Merge branch 'linus' into next
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 @@ #endif #ifndef UTS_NODENAME -#define UTS_NODENAME "(none)" /* set by sethostname() */ +#define UTS_NODENAME CONFIG_DEFAULT_HOSTNAME /* set by sethostname() */ #endif #ifndef UTS_DOMAINNAME |