diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-08-28 01:40:26 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-08-28 01:40:26 +0200 |
| commit | 4a9bf88a5caa8495b5eb2b738d5fb40924bbc538 (patch) | |
| tree | 7c2901cb67a7dd7c863fee6924afe24be79cddab /arch/x86/Kconfig | |
| parent | nvdimm: change to use generic kvfree() (diff) | |
| parent | nd_blk: change aperture mapping from WC to WB (diff) | |
| download | linux-4a9bf88a5caa8495b5eb2b738d5fb40924bbc538.tar.xz linux-4a9bf88a5caa8495b5eb2b738d5fb40924bbc538.zip | |
Merge branch 'pmem-api' into libnvdimm-for-next
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 76c61154ed50..03ab6122325a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -28,6 +28,7 @@ config X86 select ARCH_HAS_FAST_MULTIPLIER select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_PMEM_API + select ARCH_HAS_MMIO_FLUSH select ARCH_HAS_SG_CHAIN select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI |