projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'origin' into for-linus
[linux-2.6-block.git]
/
arch
/
arm
/
kernel
/
Makefile
diff --git
a/arch/arm/kernel/Makefile
b/arch/arm/kernel/Makefile
index 6808e01aedcd7ad3fbac27629316c69a0d0cf405..79087dd6d869c34ec933bbb556f1bf975a4056ce 100644
(file)
--- a/
arch/arm/kernel/Makefile
+++ b/
arch/arm/kernel/Makefile
@@
-2,7
+2,8
@@
# Makefile for the linux kernel.
#
-AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
+CPPFLAGS_vmlinux.lds := -DTEXT_OFFSET=$(TEXT_OFFSET)
+AFLAGS_head.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
ifdef CONFIG_DYNAMIC_FTRACE
CFLAGS_REMOVE_ftrace.o = -pg