summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:13:19 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:13:19 +0200
commit96c4d6e71d27a2de591d185aa897d2d215f8588e (patch)
treeebde81704c1777100e933cd241d8fb53de9ff0ad /arch/i386/kernel
parent84629d8d3695cab7177e9a04ccc212727280bdd8 (diff)
downloadop-kernel-dev-96c4d6e71d27a2de591d185aa897d2d215f8588e.zip
op-kernel-dev-96c4d6e71d27a2de591d185aa897d2d215f8588e.tar.gz
i386: prepare shared kernel/acpi/Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386/kernel')
-rw-r--r--arch/i386/kernel/acpi/Makefile13
-rw-r--r--arch/i386/kernel/acpi/Makefile_3210
2 files changed, 14 insertions, 9 deletions
diff --git a/arch/i386/kernel/acpi/Makefile b/arch/i386/kernel/acpi/Makefile
index a4852a2..6e00bfe 100644
--- a/arch/i386/kernel/acpi/Makefile
+++ b/arch/i386/kernel/acpi/Makefile
@@ -1,10 +1,5 @@
-obj-$(CONFIG_ACPI) += boot.o
-ifneq ($(CONFIG_PCI),)
-obj-$(CONFIG_X86_IO_APIC) += earlyquirk_32.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
-obj-$(CONFIG_ACPI_SLEEP) += sleep_32.o wakeup_32.o
-
-ifneq ($(CONFIG_ACPI_PROCESSOR),)
-obj-y += cstate.o processor.o
-endif
-
diff --git a/arch/i386/kernel/acpi/Makefile_32 b/arch/i386/kernel/acpi/Makefile_32
new file mode 100644
index 0000000..a4852a2
--- /dev/null
+++ b/arch/i386/kernel/acpi/Makefile_32
@@ -0,0 +1,10 @@
+obj-$(CONFIG_ACPI) += boot.o
+ifneq ($(CONFIG_PCI),)
+obj-$(CONFIG_X86_IO_APIC) += earlyquirk_32.o
+endif
+obj-$(CONFIG_ACPI_SLEEP) += sleep_32.o wakeup_32.o
+
+ifneq ($(CONFIG_ACPI_PROCESSOR),)
+obj-y += cstate.o processor.o
+endif
+
OpenPOWER on IntegriCloud