1 files changed, 13 insertions, 7 deletions

diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
index c2c27a41ab8f..fc8854b09dfa 100644
--- a/arch/x86/realmode/rm/Makefile
+++ b/arch/x86/realmode/rm/Makefile
@@ -7,21 +7,26 @@
 #
 #
 
-subdir- := wakeup
-
 always := realmode.bin
 
 realmode-y                      += header.o
 realmode-y                      += trampoline_$(BITS).o
 realmode-y                      += stack.o
 realmode-$(CONFIG_X86_32)       += reboot_32.o
-realmode-$(CONFIG_ACPI_SLEEP)   += wakeup/wakeup.o
+realmode-$(CONFIG_ACPI_SLEEP)   += $(wakeup-objs)
+
+wakeup-objs     := wakeup_asm.o wakemain.o video-mode.o
+wakeup-objs     += copy.o bioscall.o regs.o
+# The link order of the video-*.o modules can matter.  In particular,
+# video-vga.o *must* be listed first, followed by video-vesa.o.
+# Hardware-specific drivers should follow in the order they should be
+# probed, and video-bios.o should typically be last.
+wakeup-objs     += video-vga.o
+wakeup-objs     += video-vesa.o
+wakeup-objs     += video-bios.o
 
 targets += $(realmode-y)
 
-$(obj)/wakeup/wakeup.o: FORCE
-        $(Q)$(MAKE) $(build)=$(obj)/wakeup $@
-
 REALMODE_OBJS = $(addprefix $(obj)/,$(realmode-y))
 
 sed-pasyms := -n -r -e 's/^([0-9a-fA-F]+) [ABCDGRSTVW] (.+)$$/pa_\2 = \2;/p'
@@ -55,7 +60,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
 
 # How to compile the 16-bit code.  Note we always compile for -march=i386,
 # that way we can complain to the user if the CPU is insufficient.
-KBUILD_CFLAGS   := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ \
+KBUILD_CFLAGS   := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \
+                   -I$(srctree)/arch/x86/boot \
                    -DDISABLE_BRANCH_PROFILING \
                    -Wall -Wstrict-prototypes \
                    -march=i386 -mregparm=3 \