Merge tag 'iommu-updates-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / firmware / Kconfig

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 074787281c9471c48eb6104e29d06e2cb03df51e..41983883cef47da740612a9966d39ec97094d593 100644 (file)
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -108,9 +108,12 @@ config DMI_SYSFS
          under /sys/firmware/dmi when this option is enabled and
          loaded.
 
+config DMI_SCAN_MACHINE_NON_EFI_FALLBACK
+       bool
+
 config ISCSI_IBFT_FIND
        bool "iSCSI Boot Firmware Table Attributes"
-       depends on X86
+       depends on X86 && ACPI
        default n
        help
          This option enables the kernel to find the region of memory