diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-16 04:16:59 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-27 08:30:01 -0400 |
| commit | 937f961a6539b0ac5ebf31472b90810bc1f02200 (patch) | |
| tree | 9f3b7eecdfda205078490dcabd823576c563bf48 | |
| parent | 3adbb7f4a32dd34993ebe3829c69694f0c5fc85b (diff) | |
x86: Move sfi to platform
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Len Brown <lenb@kernel.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
| -rw-r--r-- | arch/x86/kernel/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/sfi/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/sfi/sfi.c (renamed from arch/x86/kernel/sfi.c) | 0 |
4 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 2c833d8c4141..d9067d10c6af 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -58,7 +58,6 @@ obj-$(CONFIG_INTEL_TXT) += tboot.o | |||
| 58 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | 58 | obj-$(CONFIG_STACKTRACE) += stacktrace.o |
| 59 | obj-y += cpu/ | 59 | obj-y += cpu/ |
| 60 | obj-y += acpi/ | 60 | obj-y += acpi/ |
| 61 | obj-$(CONFIG_SFI) += sfi.o | ||
| 62 | obj-y += reboot.o | 61 | obj-y += reboot.o |
| 63 | obj-$(CONFIG_MCA) += mca_32.o | 62 | obj-$(CONFIG_MCA) += mca_32.o |
| 64 | obj-$(CONFIG_X86_MSR) += msr.o | 63 | obj-$(CONFIG_X86_MSR) += msr.o |
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index fdf4113befba..a964fa3c0868 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile | |||
| @@ -1 +1,2 @@ | |||
| 1 | # Platform specific code goes here | 1 | # Platform specific code goes here |
| 2 | obj-y += sfi/ | ||
diff --git a/arch/x86/platform/sfi/Makefile b/arch/x86/platform/sfi/Makefile new file mode 100644 index 000000000000..cc5db1168a5e --- /dev/null +++ b/arch/x86/platform/sfi/Makefile | |||
| @@ -0,0 +1 @@ | |||
| obj-$(CONFIG_SFI) += sfi.o | |||
diff --git a/arch/x86/kernel/sfi.c b/arch/x86/platform/sfi/sfi.c index dd4c281ffe57..dd4c281ffe57 100644 --- a/arch/x86/kernel/sfi.c +++ b/arch/x86/platform/sfi/sfi.c | |||