projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://github.com/openrisc/linux
[linux-2.6-microblaze.git]
/
arch
/
xtensa
/
Kconfig
diff --git
a/arch/xtensa/Kconfig
b/arch/xtensa/Kconfig
index
f02b885
..
9bf2a9b
100644
(file)
--- a/
arch/xtensa/Kconfig
+++ b/
arch/xtensa/Kconfig
@@
-31,7
+31,7
@@
config XTENSA
select HAVE_DMA_CONTIGUOUS
select HAVE_EXIT_THREAD
select HAVE_FUNCTION_TRACER
- select HAVE_FUTEX_CMPXCHG if !MMU
+ select HAVE_FUTEX_CMPXCHG if !MMU
&& FUTEX
select HAVE_HW_BREAKPOINT if PERF_EVENTS
select HAVE_IRQ_TIME_ACCOUNTING
select HAVE_PCI