diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
| commit | 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (patch) | |
| tree | a9e7f0563cef296b24c53b20dbb388ec5c210172 /scripts/mkcompile_h | |
| parent | 1c14e6cecb1811543b1016f27e5d308fbea8c08a (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/serial_sci.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'scripts/mkcompile_h')
| -rwxr-xr-x | scripts/mkcompile_h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h index 23dbad80cce9..50ad317a4bf9 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h | |||
| @@ -67,9 +67,8 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" | |||
| 67 | echo \#define LINUX_COMPILE_BY \"`whoami`\" | 67 | echo \#define LINUX_COMPILE_BY \"`whoami`\" |
| 68 | echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" | 68 | echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" |
| 69 | 69 | ||
| 70 | if [ -x /bin/dnsdomainname ]; then | 70 | domain=`dnsdomainname 2> /dev/null` |
| 71 | domain=`dnsdomainname 2> /dev/null` | 71 | if [ -z "$domain" ]; then |
| 72 | elif [ -x /bin/domainname ]; then | ||
| 73 | domain=`domainname 2> /dev/null` | 72 | domain=`domainname 2> /dev/null` |
| 74 | fi | 73 | fi |
| 75 | 74 | ||