From 0ec725fd4f201bbb8b21de7c97fcd3528c821891 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <jw@emlix.com>
Date: Wed, 4 Mar 2009 16:21:32 +0100
Subject: [PATCH] --- yaml --- r: 140357 b: refs/heads/master c:
 6770fa020fe3b63915ab082b4e5fd99d2d368c82 h: refs/heads/master i:   140355:
 7b5f6320f7ba2b435cc6cd892fce1fa348f65200 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/xtensa/kernel/vmlinux.lds.S | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index af460ab0eb2b..c88a4cf72f58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 000af2c5a8913ebd763313d0c9ebc66c2c4765b1
+refs/heads/master: 6770fa020fe3b63915ab082b4e5fd99d2d368c82
diff --git a/trunk/arch/xtensa/kernel/vmlinux.lds.S b/trunk/arch/xtensa/kernel/vmlinux.lds.S
index d506774f4b05..c1be9a4a740c 100644
--- a/trunk/arch/xtensa/kernel/vmlinux.lds.S
+++ b/trunk/arch/xtensa/kernel/vmlinux.lds.S
@@ -17,6 +17,7 @@
 #include <asm-generic/vmlinux.lds.h>
 
 #include <variant/core.h>
+#include <platform/hardware.h>
 OUTPUT_ARCH(xtensa)
 ENTRY(_start)
 
@@ -26,7 +27,9 @@ jiffies = jiffies_64 + 4;
 jiffies = jiffies_64;
 #endif
 
+#ifndef KERNELOFFSET
 #define KERNELOFFSET 0xd0001000
+#endif
 
 /* Note: In the following macros, it would be nice to specify only the
    vector name and section kind and construct "sym" and "section" using