git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
ia64
/
configs
/
sn2_defconfig
diff --git
a/arch/ia64/configs/sn2_defconfig
b/arch/ia64/configs/sn2_defconfig
index
64e951d
..
4c9ffc4
100644
(file)
--- a/
arch/ia64/configs/sn2_defconfig
+++ b/
arch/ia64/configs/sn2_defconfig
@@
-93,7
+93,7
@@
CONFIG_SWIOTLB=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
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