1 files changed, 12 insertions, 3 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e5790fe9e330..a12dbb2b93f3 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -86,9 +86,6 @@ config GENERIC_GPIO
 config ARCH_MAY_HAVE_PC_FDC
         def_bool y
 
-config DMI
-        def_bool y
-
 config RWSEM_GENERIC_SPINLOCK
         def_bool !X86_XADD
 
@@ -114,6 +111,9 @@ config GENERIC_TIME_VSYSCALL
 config ARCH_HAS_CPU_RELAX
         def_bool y
 
+config ARCH_HAS_CACHE_LINE_SIZE
+        def_bool y
+
 config HAVE_SETUP_PER_CPU_AREA
         def_bool X86_64 || (X86_SMP && !X86_VOYAGER)
 
@@ -482,6 +482,15 @@ config HPET_EMULATE_RTC
 
 # Mark as embedded because too many people got it wrong.
 # The code disables itself when not needed.
+config DMI
+        default y
+        bool "Enable DMI scanning" if EMBEDDED
+        help
+          Enabled scanning of DMI to identify machine quirks. Say Y
+          here unless you have verified that your setup is not
+          affected by entries in the DMI blacklist. Required by PNP
+          BIOS code.
+
 config GART_IOMMU
         bool "GART IOMMU support" if EMBEDDED
         default y