From 685896442856cc983af3dfa96b18ff29ecf4a380 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 16 Oct 2010 10:16:59 +0200 Subject: [PATCH] --- yaml --- r: 220523 b: refs/heads/master c: 937f961a6539b0ac5ebf31472b90810bc1f02200 h: refs/heads/master i: 220521: 902c4e27c17ce099932717e7e1b903d386d76bfe 220519: 55472806f5aefb847a5bda1a7da0e6ab58123428 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 1 - trunk/arch/x86/platform/Makefile | 1 + trunk/arch/x86/platform/sfi/Makefile | 1 + trunk/arch/x86/{kernel => platform/sfi}/sfi.c | 0 5 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 trunk/arch/x86/platform/sfi/Makefile rename trunk/arch/x86/{kernel => platform/sfi}/sfi.c (100%) diff --git a/[refs] b/[refs] index 520442763078..dbf26912d83f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3adbb7f4a32dd34993ebe3829c69694f0c5fc85b +refs/heads/master: 937f961a6539b0ac5ebf31472b90810bc1f02200 diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index 2c833d8c4141..d9067d10c6af 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/arch/x86/kernel/Makefile @@ -58,7 +58,6 @@ obj-$(CONFIG_INTEL_TXT) += tboot.o obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-y += cpu/ obj-y += acpi/ -obj-$(CONFIG_SFI) += sfi.o obj-y += reboot.o obj-$(CONFIG_MCA) += mca_32.o obj-$(CONFIG_X86_MSR) += msr.o diff --git a/trunk/arch/x86/platform/Makefile b/trunk/arch/x86/platform/Makefile index fdf4113befba..a964fa3c0868 100644 --- a/trunk/arch/x86/platform/Makefile +++ b/trunk/arch/x86/platform/Makefile @@ -1 +1,2 @@ # Platform specific code goes here +obj-y += sfi/ diff --git a/trunk/arch/x86/platform/sfi/Makefile b/trunk/arch/x86/platform/sfi/Makefile new file mode 100644 index 000000000000..cc5db1168a5e --- /dev/null +++ b/trunk/arch/x86/platform/sfi/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_SFI) += sfi.o diff --git a/trunk/arch/x86/kernel/sfi.c b/trunk/arch/x86/platform/sfi/sfi.c similarity index 100% rename from trunk/arch/x86/kernel/sfi.c rename to trunk/arch/x86/platform/sfi/sfi.c