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 branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/ia64/kernel/vmlinux.lds.S
b/arch/ia64/kernel/vmlinux.lds.S
index 5929ab10a289d8adeec09ee13ba0a4b03ed4d2ca..5a77206c2492e0c000140a18a179d7d461ab3dee 100644
(file)
--- a/
arch/ia64/kernel/vmlinux.lds.S
+++ b/
arch/ia64/kernel/vmlinux.lds.S
@@
-4,7
+4,6
@@
#include <asm/system.h>
#include <asm/pgtable.h>
-#define LOAD_OFFSET (KERNEL_START - KERNEL_TR_PAGE_SIZE)
#include <asm-generic/vmlinux.lds.h>
#define IVT_TEXT \