Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[~shefty/rdma-dev.git] / arch / ia64 / Kconfig
index da18c8e0521739829cfec289cd84f963adcc4a49..d393f841ff5acb660f120de6c545803e9b0b6dd3 100644 (file)
@@ -188,7 +188,7 @@ config IA64_DIG
 
 config IA64_DIG_VTD
        bool "DIG+Intel+IOMMU"
-       select DMAR
+       select INTEL_IOMMU
        select PCI_MSI
 
 config IA64_HP_ZX1
@@ -592,9 +592,9 @@ source "kernel/power/Kconfig"
 source "drivers/acpi/Kconfig"
 
 if PM
-
-source "arch/ia64/kernel/cpufreq/Kconfig"
-
+menu "CPU Frequency scaling"
+source "drivers/cpufreq/Kconfig"
+endmenu
 endif
 
 endmenu