diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 08:00:25 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 08:00:25 +0200 |
| commit | 31881d74b6dd1a6c530cff61248def4f2da38bee (patch) | |
| tree | be62420cf39192074e13b25553d172b9d5e58a33 /arch/ia64/Kconfig | |
| parent | Input: wacom_i2c - implement hovering capability (diff) | |
| parent | Input: MT - Specify that ABS_MT_SLOT must have a minimum of 0 (diff) | |
| download | linux-31881d74b6dd1a6c530cff61248def4f2da38bee.tar.xz linux-31881d74b6dd1a6c530cff61248def4f2da38bee.zip | |
Merge branch 'for-next' of git://github.com/rydberg/linux into next
Pull in changes from Henrik: "a trivial MT documentation fix".
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 9a02f71c6b1f..1a2b7749b047 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 @@ -187,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 @@ -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 |