diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Kconfig | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a8ce13a54764..a12dbb2b93f3 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -86,9 +86,6 @@ config GENERIC_GPIO | |||
86 | config ARCH_MAY_HAVE_PC_FDC | 86 | config ARCH_MAY_HAVE_PC_FDC |
87 | def_bool y | 87 | def_bool y |
88 | 88 | ||
89 | config DMI | ||
90 | def_bool y | ||
91 | |||
92 | config RWSEM_GENERIC_SPINLOCK | 89 | config RWSEM_GENERIC_SPINLOCK |
93 | def_bool !X86_XADD | 90 | def_bool !X86_XADD |
94 | 91 | ||
@@ -485,6 +482,15 @@ config HPET_EMULATE_RTC | |||
485 | 482 | ||
486 | # Mark as embedded because too many people got it wrong. | 483 | # Mark as embedded because too many people got it wrong. |
487 | # The code disables itself when not needed. | 484 | # The code disables itself when not needed. |
485 | config DMI | ||
486 | default y | ||
487 | bool "Enable DMI scanning" if EMBEDDED | ||
488 | help | ||
489 | Enabled scanning of DMI to identify machine quirks. Say Y | ||
490 | here unless you have verified that your setup is not | ||
491 | affected by entries in the DMI blacklist. Required by PNP | ||
492 | BIOS code. | ||
493 | |||
488 | config GART_IOMMU | 494 | config GART_IOMMU |
489 | bool "GART IOMMU support" if EMBEDDED | 495 | bool "GART IOMMU support" if EMBEDDED |
490 | default y | 496 | default y |