diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
| commit | c3cc99ff5d24e2eeaf7ec2032e720681916990e3 (patch) | |
| tree | c3e74171bbbd2adde9d60b9db1c440415c8d2831 /init/version.c | |
| parent | 38ffbe66d59051fd9cfcfc8545f164700e2fa3bc (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'init/version.c')
| -rw-r--r-- | init/version.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/init/version.c b/init/version.c index 9d17d70ee02d..52a8b98642b8 100644 --- a/init/version.c +++ b/init/version.c | |||
| @@ -13,10 +13,13 @@ | |||
| 13 | #include <linux/utsrelease.h> | 13 | #include <linux/utsrelease.h> |
| 14 | #include <linux/version.h> | 14 | #include <linux/version.h> |
| 15 | 15 | ||
| 16 | #ifndef CONFIG_KALLSYMS | ||
| 16 | #define version(a) Version_ ## a | 17 | #define version(a) Version_ ## a |
| 17 | #define version_string(a) version(a) | 18 | #define version_string(a) version(a) |
| 18 | 19 | ||
| 20 | extern int version_string(LINUX_VERSION_CODE); | ||
| 19 | int version_string(LINUX_VERSION_CODE); | 21 | int version_string(LINUX_VERSION_CODE); |
| 22 | #endif | ||
| 20 | 23 | ||
| 21 | struct uts_namespace init_uts_ns = { | 24 | struct uts_namespace init_uts_ns = { |
| 22 | .kref = { | 25 | .kref = { |