diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-04 17:11:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-04 17:11:43 -0700 |
commit | 45ea2103d8856454503b30464cc1dba378748d00 (patch) | |
tree | f045cfc184e4103252d670145d18778220a5a3c1 /arch/x86/kernel/acpi/realmode/Makefile | |
parent | 10ea18f0deb2372417c8e5be4d2ec79de1f65c4b (diff) | |
parent | 62179849b40aded9e727cca5006627a1c4d6446e (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
x86: fix setup printk format warning
x86: olpc build fix
x86: video/fbdev.c: add MODULE_LICENSE
x86: fix up bootparam.h for userspace inclusion
x86: relocs ELF handling - use SELFMAG instead of numeric constant
x86: vdso ELF handling - use SELFMAG instead of numeric constant
x86: remove dell reboot dmi quirk board name match
x86: es7000 build fix
x86: make additional_cpus static
x86: make start_secondary() static
kbuild, suspend, x86: fix rebuild of wakeup.bin
uml: fix gcc problem
x86: undo visws/numaq build changes
Diffstat (limited to 'arch/x86/kernel/acpi/realmode/Makefile')
-rw-r--r-- | arch/x86/kernel/acpi/realmode/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile index 092900854ac..1c31cc0e9de 100644 --- a/arch/x86/kernel/acpi/realmode/Makefile +++ b/arch/x86/kernel/acpi/realmode/Makefile @@ -6,7 +6,8 @@ # for more details. # -targets := wakeup.bin wakeup.elf +always := wakeup.bin +targets := wakeup.elf wakeup.lds wakeup-y += wakeup.o wakemain.o video-mode.o copy.o @@ -48,7 +49,7 @@ LDFLAGS_wakeup.elf := -T CPPFLAGS_wakeup.lds += -P -C -$(obj)/wakeup.elf: $(src)/wakeup.lds $(WAKEUP_OBJS) FORCE +$(obj)/wakeup.elf: $(obj)/wakeup.lds $(WAKEUP_OBJS) FORCE $(call if_changed,ld) OBJCOPYFLAGS_wakeup.bin := -O binary |