summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:15:27 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:15:27 +0200
commitf11cfb424c78ef8a6d9fc80922577756cec00282 (patch)
treed0d7e639001fcfd0481e1ac5f69471b54dcbb117
parent08c81f47fcba935d937e45a592ad7b00e9296a2f (diff)
downloadblackbird-op-linux-f11cfb424c78ef8a6d9fc80922577756cec00282.tar.gz
blackbird-op-linux-f11cfb424c78ef8a6d9fc80922577756cec00282.zip
x86_64: prepare shared kernel/acpi/Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86_64/kernel/acpi/Makefile12
-rw-r--r--arch/x86_64/kernel/acpi/Makefile_649
2 files changed, 13 insertions, 8 deletions
diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile
index c24fe95b0d94..6e00bfeb59a9 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 000000000000..c24fe95b0d94
--- /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
+
OpenPOWER on IntegriCloud