diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 13:16:23 +0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 13:16:23 +0400 |
commit | 23d6f82bd1f07886b3a974c5193baa715475dd37 (patch) | |
tree | 71712aa315b370bd30fc38708c08ab45e29d3226 | |
parent | 9c2019421511a1bc646981d55528334ae46464c0 (diff) | |
download | linux-23d6f82bd1f07886b3a974c5193baa715475dd37.tar.xz |
i386: move kernel/acpi
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/i386/kernel/Makefile_32 | 2 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/Makefile (renamed from arch/i386/kernel/acpi/Makefile) | 2 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/Makefile_32 (renamed from arch/i386/kernel/acpi/Makefile_32) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/boot.c (renamed from arch/i386/kernel/acpi/boot.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/cstate.c (renamed from arch/i386/kernel/acpi/cstate.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/earlyquirk_32.c (renamed from arch/i386/kernel/acpi/earlyquirk_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/processor.c (renamed from arch/i386/kernel/acpi/processor.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/sleep_32.c (renamed from arch/i386/kernel/acpi/sleep_32.c) | 0 | ||||
-rw-r--r-- | arch/x86/kernel/acpi/wakeup_32.S (renamed from arch/i386/kernel/acpi/wakeup_32.S) | 0 | ||||
-rw-r--r-- | arch/x86_64/kernel/acpi/Makefile | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/acpi/Makefile_64 | 4 |
11 files changed, 5 insertions, 5 deletions
diff --git a/arch/i386/kernel/Makefile_32 b/arch/i386/kernel/Makefile_32 index d9dd3d677b72..af8304b921de 100644 --- a/arch/i386/kernel/Makefile_32 +++ b/arch/i386/kernel/Makefile_32 @@ -11,7 +11,7 @@ obj-y := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \ obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-y += cpu/ -obj-y += acpi/ +obj-y += ../../x86/kernel/acpi/ obj-$(CONFIG_X86_BIOS_REBOOT) += reboot_32.o obj-$(CONFIG_MCA) += mca_32.o obj-$(CONFIG_X86_MSR) += msr.o diff --git a/arch/i386/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile index 6e00bfeb59a9..dd4eb7cef2b4 100644 --- a/arch/i386/kernel/acpi/Makefile +++ b/arch/x86/kernel/acpi/Makefile @@ -1,5 +1,5 @@ ifeq ($(CONFIG_X86_32),y) -include ${srctree}/arch/i386/kernel/acpi/Makefile_32 +include ${srctree}/arch/x86/kernel/acpi/Makefile_32 else include ${srctree}/arch/x86_64/kernel/acpi/Makefile_64 endif diff --git a/arch/i386/kernel/acpi/Makefile_32 b/arch/x86/kernel/acpi/Makefile_32 index a4852a2e9190..a4852a2e9190 100644 --- a/arch/i386/kernel/acpi/Makefile_32 +++ b/arch/x86/kernel/acpi/Makefile_32 diff --git a/arch/i386/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index cacdd883bf2b..cacdd883bf2b 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c diff --git a/arch/i386/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c index 2d39f55d29a8..2d39f55d29a8 100644 --- a/arch/i386/kernel/acpi/cstate.c +++ b/arch/x86/kernel/acpi/cstate.c diff --git a/arch/i386/kernel/acpi/earlyquirk_32.c b/arch/x86/kernel/acpi/earlyquirk_32.c index 23f78efc577d..23f78efc577d 100644 --- a/arch/i386/kernel/acpi/earlyquirk_32.c +++ b/arch/x86/kernel/acpi/earlyquirk_32.c diff --git a/arch/i386/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c index b54fded49834..b54fded49834 100644 --- a/arch/i386/kernel/acpi/processor.c +++ b/arch/x86/kernel/acpi/processor.c diff --git a/arch/i386/kernel/acpi/sleep_32.c b/arch/x86/kernel/acpi/sleep_32.c index c42b5ab49deb..c42b5ab49deb 100644 --- a/arch/i386/kernel/acpi/sleep_32.c +++ b/arch/x86/kernel/acpi/sleep_32.c diff --git a/arch/i386/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S index f22ba8534d26..f22ba8534d26 100644 --- a/arch/i386/kernel/acpi/wakeup_32.S +++ b/arch/x86/kernel/acpi/wakeup_32.S diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile index 6e00bfeb59a9..dd4eb7cef2b4 100644 --- a/arch/x86_64/kernel/acpi/Makefile +++ b/arch/x86_64/kernel/acpi/Makefile @@ -1,5 +1,5 @@ ifeq ($(CONFIG_X86_32),y) -include ${srctree}/arch/i386/kernel/acpi/Makefile_32 +include ${srctree}/arch/x86/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 index c24fe95b0d94..fc377c87e0b0 100644 --- a/arch/x86_64/kernel/acpi/Makefile_64 +++ b/arch/x86_64/kernel/acpi/Makefile_64 @@ -1,9 +1,9 @@ obj-y := boot.o -boot-y := ../../../i386/kernel/acpi/boot.o +boot-y := ../../../x86/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 +processor-y := ../../../x86/kernel/acpi/processor.o ../../../x86/kernel/acpi/cstate.o endif |