X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Fia64%2FKconfig;h=1a2b7749b0478a75c49e58df2862de0765d71980;hb=e86c986137ee410190093d9ba86b86854861b9d5;hp=e7e55a00f94f6072bd57217e34a6fe6d8f201b10;hpb=39b2f8656e2af4d5d490ce6e33e4ba229cda3e33;p=~andy%2Flinux

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index e7e55a00f94..1a2b7749b04 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -101,15 +101,13 @@ config GENERIC_CALIBRATE_DELAY
 config HAVE_SETUP_PER_CPU_AREA
 	def_bool y
 
-config GENERIC_GPIO
-	bool
-
 config DMI
 	bool
 	default y
 
 config EFI
 	bool
+	select UCS2_STRING
 	default y
 
 config SCHED_OMIT_FRAME_POINTER
@@ -591,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