From ff63b51a0af6749469dc7ac5124a683d0e750841 Mon Sep 17 00:00:00 2001
From: Daniel Guilak <guilak@linux.vnet.ibm.com>
Date: Fri, 25 Jul 2008 01:45:50 -0700
Subject: [PATCH] --- yaml --- r: 105812 b: refs/heads/master c:
 197dcffc8ba0ea943fee86e28e99cd9575799772 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/init/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 92268964e1d8..85d13ec80bfc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 277e2c695907a70b316a31769cd891dc4d43b7f3
+refs/heads/master: 197dcffc8ba0ea943fee86e28e99cd9575799772
diff --git a/trunk/init/version.c b/trunk/init/version.c
index 041fd822ce24..52a8b98642b8 100644
--- a/trunk/init/version.c
+++ b/trunk/init/version.c
@@ -13,11 +13,13 @@
 #include <linux/utsrelease.h>
 #include <linux/version.h>
 
+#ifndef CONFIG_KALLSYMS
 #define version(a) Version_ ## a
 #define version_string(a) version(a)
 
 extern int version_string(LINUX_VERSION_CODE);
 int version_string(LINUX_VERSION_CODE);
+#endif
 
 struct uts_namespace init_uts_ns = {
 	.kref = {