Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer

Conflicts:
	arch/arm/mach-omap2/timer.c

1 files changed, 6 insertions, 1 deletions

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 4235a6361fec..b3d907eb93a9 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -74,8 +74,13 @@ kallsyms()
         info KSYM ${2}
         local kallsymopt;
 
+        if [ -n "${CONFIG_SYMBOL_PREFIX}" ]; then
+                kallsymopt="${kallsymopt} \
+                            --symbol-prefix=${CONFIG_SYMBOL_PREFIX}"
+        fi
+
         if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
-                kallsymopt=--all-symbols
+                kallsymopt="${kallsymopt} --all-symbols"
         fi
 
         local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \