diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-07-20 14:26:47 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-07-20 14:26:47 -0400 |
| commit | c36c282b88963d0957368a443168588e62301fda (patch) | |
| tree | 6343887ae42a65635a61b4ad99fd7f3e8dd24758 /arch/ia64/defconfig | |
| parent | f4fbfb0dda5577075a049eec7fb7ad38abca1912 (diff) | |
| parent | 1f564ad6d4182859612cbae452122e5eb2d62a76 (diff) | |
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 | |||
| 97 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 97 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 98 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 98 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
| 99 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 99 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 100 | CONFIG_TIME_INTERPOLATION=y | 100 | CONFIG_GENERIC_TIME=y |
| 101 | CONFIG_DMI=y | 101 | CONFIG_DMI=y |
| 102 | CONFIG_EFI=y | 102 | CONFIG_EFI=y |
| 103 | CONFIG_GENERIC_IOMAP=y | 103 | CONFIG_GENERIC_IOMAP=y |