[PATCH] x86: intel-mid: make X86_INTEL_MID depending on SFI

[David Cohen]

Despite our intention to not make Intel MID dependent of SFI, it does
not reflect the current situation.
If SFI is not selected, Intel MID can't select APB_TIMER otherwise this
happens:

arch/x86/built-in.o: In function `apbt_set_mapping':
arch/x86/kernel/apb_timer.c:91: undefined reference to `sfi_get_mtmr'
arch/x86/kernel/apb_timer.c:109: undefined reference to `sfi_free_mtmr'
arch/x86/kernel/apb_timer.c:112: undefined reference to `sfi_get_mtmr'
arch/x86/kernel/apb_timer.c:91: undefined reference to `sfi_get_mtmr'
arch/x86/kernel/apb_timer.c:109: undefined reference to `sfi_free_mtmr'
arch/x86/kernel/apb_timer.c:112: undefined reference to `sfi_get_mtmr'

This patch solves such problem by adding SFI as dependence of
X86_INTEL_MID. As soon as we make Intel MID completely independent of
SFI this patch is safe to be reverted.

Signed-off-by: David Cohen <david.a.cohen@xxxxxxxxxxxxxxx>
---

This patch is intended to be applied on kernel 3.13-rc release.

As a matter of curiosity, CONFIG_APB_TIMER does depend on CONFIG_SFI. But looks
like CONFIG_X86_INTEL_MID is able to bypass it.
Maybe we need to check Kconfig itself too?

 arch/x86/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 00fa3b7d2abe..5802476d4e91 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -447,6 +447,7 @@ config X86_INTEL_MID
 	depends on PCI
 	depends on PCI_GOANY
 	depends on X86_IO_APIC
+	depends on SFI
 	select DW_APB_TIMER
 	select APB_TIMER
 	select INTEL_SCU_IPC
-- 
1.8.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/