From: Thomas Gleixner Date: Thu, 11 Oct 2007 09:15:27 +0000 (+0200) Subject: x86_64: prepare shared kernel/acpi/Makefile X-Git-Tag: v2.6.24-rc1~1548 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f11cfb424c78ef8a6d9fc80922577756cec00282;p=linux-2.6 x86_64: prepare shared kernel/acpi/Makefile Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile index c24fe95b0d..6e00bfeb59 100644 --- a/arch/x86_64/kernel/acpi/Makefile +++ b/arch/x86_64/kernel/acpi/Makefile @@ -1,9 +1,5 @@ -obj-y := boot.o -boot-y := ../../../i386/kernel/acpi/boot.o -obj-$(CONFIG_ACPI_SLEEP) += sleep_64.o wakeup_64.o - -ifneq ($(CONFIG_ACPI_PROCESSOR),) -obj-y += processor.o -processor-y := ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o +ifeq ($(CONFIG_X86_32),y) +include ${srctree}/arch/i386/kernel/acpi/Makefile_32 +else +include ${srctree}/arch/x86_64/kernel/acpi/Makefile_64 endif - diff --git a/arch/x86_64/kernel/acpi/Makefile_64 b/arch/x86_64/kernel/acpi/Makefile_64 new file mode 100644 index 0000000000..c24fe95b0d --- /dev/null +++ b/arch/x86_64/kernel/acpi/Makefile_64 @@ -0,0 +1,9 @@ +obj-y := boot.o +boot-y := ../../../i386/kernel/acpi/boot.o +obj-$(CONFIG_ACPI_SLEEP) += sleep_64.o wakeup_64.o + +ifneq ($(CONFIG_ACPI_PROCESSOR),) +obj-y += processor.o +processor-y := ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o +endif +