Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[karo-tx-linux.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 38ef339190ee62730b3cfa974c63c776f5a4de71..1a2b7749b0478a75c49e58df2862de0765d71980 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -107,6 +107,7 @@ config DMI
 
 config EFI
        bool
+       select UCS2_STRING
        default y
 
 config SCHED_OMIT_FRAME_POINTER
@@ -184,7 +185,7 @@ config IA64_DIG
 
 config IA64_DIG_VTD
        bool "DIG+Intel+IOMMU"
-       select DMAR
+       select INTEL_IOMMU
        select PCI_MSI
 
 config IA64_HP_ZX1
@@ -588,9 +589,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