summaryrefslogtreecommitdiffstats
path: root/arch/v850/kernel/entry.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 15:46:49 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 15:46:49 -0700
commit486a153f0e294f7cc735838edcb6b32e623cbe52 (patch)
treef16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/v850/kernel/entry.S
parent9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff)
parentf64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff)
downloadlinux-486a153f0e294f7cc735838edcb6b32e623cbe52.tar.gz
linux-486a153f0e294f7cc735838edcb6b32e623cbe52.tar.bz2
linux-486a153f0e294f7cc735838edcb6b32e623cbe52.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/v850/kernel/entry.S')
-rw-r--r--arch/v850/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/v850/kernel/entry.S b/arch/v850/kernel/entry.S
index 895e27b1d839..d991e4547dbb 100644
--- a/arch/v850/kernel/entry.S
+++ b/arch/v850/kernel/entry.S
@@ -22,7 +22,7 @@
#include <asm/irq.h>
#include <asm/errno.h>
-#include <asm/asm-consts.h>
+#include <asm/asm-offsets.h>
/* Make a slightly more convenient alias for C_SYMBOL_NAME. */