git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull ia64-clocksource into release branch
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
defconfig
diff --git
a/arch/ia64/defconfig
b/arch/ia64/defconfig
index 80298ef905ebc0e9b3210e61158ef5484759bee9..03172dc8c4031fb51e8e1a620617f330076d85e9 100644
(file)
--- 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