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
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
Kconfig
diff --git
a/arch/powerpc/Kconfig
b/arch/powerpc/Kconfig
index 78d6588b6e8622efd2860627b7deb8f0af389be0..969f3d9ded91941cb4323052df4f465764259608 100644
(file)
--- a/
arch/powerpc/Kconfig
+++ b/
arch/powerpc/Kconfig
@@
-137,7
+137,7
@@
config PPC
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select GENERIC_SMP_IDLE_THREAD
select GENERIC_CMOS_UPDATE
- select GENERIC_TIME_VSYSCALL
+ select GENERIC_TIME_VSYSCALL
_OLD
select GENERIC_CLOCKEVENTS
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER