git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[sfrench/cifs-2.6.git]
/
init
/
version.c
diff --git
a/init/version.c
b/init/version.c
index 2a5dfcd1c2e6a373bb81dfa100b786e133066316..9d17d70ee02d0165e4f94e5eacda6ea7c808a469 100644
(file)
--- a/
init/version.c
+++ b/
init/version.c
@@
-12,7
+12,6
@@
#include <linux/utsname.h>
#include <linux/utsrelease.h>
#include <linux/version.h>
#include <linux/utsname.h>
#include <linux/utsrelease.h>
#include <linux/version.h>
-#include <linux/sched.h>
#define version(a) Version_ ## a
#define version_string(a) version(a)
#define version(a) Version_ ## a
#define version_string(a) version(a)
@@
-34,7
+33,12
@@
struct uts_namespace init_uts_ns = {
};
EXPORT_SYMBOL_GPL(init_uts_ns);
};
EXPORT_SYMBOL_GPL(init_uts_ns);
+/* FIXED STRINGS! Don't touch! */
const char linux_banner[] =
const char linux_banner[] =
- "Linux version
%s
(" LINUX_COMPILE_BY "@"
- LINUX_COMPILE_HOST ") (" LINUX_COMPILER ")
%s
\n";
+ "Linux version
" UTS_RELEASE "
(" LINUX_COMPILE_BY "@"
+ LINUX_COMPILE_HOST ") (" LINUX_COMPILER ")
" UTS_VERSION "
\n";
+const char linux_proc_banner[] =
+ "%s version %s"
+ " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
+ " (" LINUX_COMPILER ") %s\n";