diff options
author | Tony Luck <tony.luck@intel.com> | 2007-07-20 11:26:47 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2007-07-20 11:26:47 -0700 |
commit | c36c282b88963d0957368a443168588e62301fda (patch) | |
tree | 6343887ae42a65635a61b4ad99fd7f3e8dd24758 /arch/ia64/defconfig | |
parent | f4fbfb0dda5577075a049eec7fb7ad38abca1912 (diff) | |
parent | 1f564ad6d4182859612cbae452122e5eb2d62a76 (diff) | |
download | blackbird-op-linux-c36c282b88963d0957368a443168588e62301fda.tar.gz blackbird-op-linux-c36c282b88963d0957368a443168588e62301fda.zip |
Pull ia64-clocksource into release branch
Diffstat (limited to 'arch/ia64/defconfig')
-rw-r--r-- | arch/ia64/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 80298ef905eb..03172dc8c403 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig @@ -97,7 +97,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 |