summaryrefslogtreecommitdiffstats
path: root/arch/ia64/defconfig
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2007-07-20 20:22:30 +0200
committerTony Luck <tony.luck@intel.com>2007-07-20 20:22:30 +0200
commit0aa366f351d044703e25c8425e508170e80d83b1 (patch)
tree485040cbef6157b9bcb2e7b1b85920d1e391ab68 /arch/ia64/defconfig
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hsk... (diff)
downloadlinux-0aa366f351d044703e25c8425e508170e80d83b1.tar.xz
linux-0aa366f351d044703e25c8425e508170e80d83b1.zip
[IA64] Convert to generic timekeeping/clocksource
This is a merge of Peter Keilty's initial patch (which was revived by Bob Picco) for this with Hidetoshi Seto's fixes and scaling improvements. Acked-by: Bob Picco <bob.picco@hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/defconfig')
-rw-r--r--arch/ia64/defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 90bd9601cdde..461f8ee738fb 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -98,7 +98,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_TIME_INTERPOLATION=y
+CONFIG_GENERIC_TIME=y
CONFIG_DMI=y
CONFIG_EFI=y
CONFIG_GENERIC_IOMAP=y