diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-11 01:40:46 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-11 01:40:46 +0300 |
| commit | 437105f2a7f23899fd647e7ada683ba8dacf11ba (patch) | |
| tree | cadcd8cb2b778e9e5c86e24526e814bdf27fc6c4 /arch/ia64/hp/sim/boot/Makefile | |
| parent | 41f81e88e01eb959f439f8537c58078e4bfc5291 (diff) | |
| parent | aa0ebec9cfb8a3fab966db75ac21d05a43f312a1 (diff) | |
| download | linux-437105f2a7f23899fd647e7ada683ba8dacf11ba.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix iosapic interrupt delivery mode for CPE
[IA64] kprobe: make kreturn probe handler stack unwind correct
[IA64] operator priority fix in acpi_map_lsapic()
[IA64] Add missing "space" to concatenated strings
[IA64] make full use of macro efi_md_size
[IA64] rename _bss to __bss_start
[IA64] SGI Altix : fix bug in sn_io_late_init()
[IA64] iosapic cleanup
[IA64] signal : fix missing error checkings
[IA64] export copy_page() to modules
[IA64] don't assume that unwcheck.py is executable
[IA64] increase .data.patch offset
Diffstat (limited to 'arch/ia64/hp/sim/boot/Makefile')
| -rw-r--r-- | arch/ia64/hp/sim/boot/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/hp/sim/boot/Makefile b/arch/ia64/hp/sim/boot/Makefile index df6e9968c845..2e805e0cc560 100644 --- a/arch/ia64/hp/sim/boot/Makefile +++ b/arch/ia64/hp/sim/boot/Makefile @@ -33,5 +33,5 @@ $(obj)/vmlinux.bin: vmlinux FORCE LDFLAGS_bootloader = -static -T $(obj)/bootloader: $(src)/bootloader.lds $(obj)/bootloader.o $(obj)/boot_head.o $(obj)/fw-emu.o \ - lib/lib.a arch/ia64/lib/lib.a FORCE + lib/lib.a arch/ia64/lib/built-in.o arch/ia64/lib/lib.a FORCE $(call if_changed,ld) |