git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into 83xx
[safe/jmp/linux-2.6]
/
arch
/
cris
/
Kconfig
diff --git
a/arch/cris/Kconfig
b/arch/cris/Kconfig
index
6a1238a
..
3474309
100644
(file)
--- a/
arch/cris/Kconfig
+++ b/
arch/cris/Kconfig
@@
-16,6
+16,14
@@
config RWSEM_GENERIC_SPINLOCK
config RWSEM_XCHGADD_ALGORITHM
bool
+config ARCH_HAS_ILOG2_U32
+ bool
+ default n
+
+config ARCH_HAS_ILOG2_U64
+ bool
+ default n
+
config GENERIC_FIND_NEXT_BIT
bool
default y