Merge branch 'for-3.17/core' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 7a7208f16ec3cc9f1057e6006680a4bb0d64d4e4..5d0bf1aa9dcb6d68fd39f395dcbef9f89954cbc0 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -434,6 +434,7 @@ config X86_INTEL_CE
        bool "CE4100 TV platform"
        depends on PCI
        depends on PCI_GODIRECT
+       depends on X86_IO_APIC
        depends on X86_32
        depends on X86_EXTENDED_PLATFORM
        select X86_REBOOTFIXUPS
@@ -840,6 +841,7 @@ config X86_IO_APIC
        def_bool y
        depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI
        select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
+       select IRQ_DOMAIN
 
 config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
        bool "Reroute for broken boot IRQs"