diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-03-04 11:51:29 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-03-04 11:51:29 +0100 |
commit | e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 (patch) | |
tree | 61b64506b2c016e050f940a89d1ffd36b7c00fdf /arch/arm/boot/compressed/Makefile | |
parent | tracing: Include irqflags headers from trace clock (diff) | |
parent | tracing: Fix warning in s_next of trace file ops (diff) | |
download | linux-e02c4fd3142dfb9412531bbfabd510a2a7c6ea46.tar.xz linux-e02c4fd3142dfb9412531bbfabd510a2a7c6ea46.zip |
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'arch/arm/boot/compressed/Makefile')
-rw-r--r-- | arch/arm/boot/compressed/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 2d4d88ba73bf..97c89e7de7d3 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -5,7 +5,7 @@ # HEAD = head.o -OBJS = misc.o +OBJS = misc.o decompress.o FONTC = $(srctree)/drivers/video/console/font_acorn_8x8.c # @@ -106,10 +106,6 @@ lib1funcs = $(obj)/lib1funcs.o $(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S FORCE $(call cmd,shipped) -# Don't allow any static data in misc.o, which -# would otherwise mess up our GOT table -CFLAGS_misc.o := -Dstatic= - $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \ $(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE $(call if_changed,ld) |