diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-24 01:17:21 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-24 01:17:21 -0500 |
| commit | da3df858c88f7bb420f2517ee9aab238da2e6ed7 (patch) | |
| tree | 49c9e69818d7a7fc59ebda96dc7abf17a0f3b088 /arch/x86/kernel/acpi/Makefile | |
| parent | 309ddc53be1766d6ed5411a3dc1782c2040198fa (diff) | |
| parent | e59897fe443b5b0a71e135ef4020d1937c9f8901 (diff) | |
Merge branch 'pdc' into release
Diffstat (limited to 'arch/x86/kernel/acpi/Makefile')
| -rw-r--r-- | arch/x86/kernel/acpi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile index fd5ca97a2ad5..6f35260bb3ef 100644 --- a/arch/x86/kernel/acpi/Makefile +++ b/arch/x86/kernel/acpi/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_ACPI) += boot.o obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup_rm.o wakeup_$(BITS).o ifneq ($(CONFIG_ACPI_PROCESSOR),) -obj-y += cstate.o processor.o +obj-y += cstate.o endif $(obj)/wakeup_rm.o: $(obj)/realmode/wakeup.bin |