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 'master' of git://git.infradead.org/users/linville/wireless into for...
[pandora-kernel.git]
/
arch
/
frv
/
Kconfig
diff --git
a/arch/frv/Kconfig
b/arch/frv/Kconfig
index
cb884e4
..
bad27a6
100644
(file)
--- a/
arch/frv/Kconfig
+++ b/
arch/frv/Kconfig
@@
-7,6
+7,7
@@
config FRV
select HAVE_PERF_EVENTS
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
select HAVE_PERF_EVENTS
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_SHOW
+ select ARCH_HAVE_NMI_SAFE_CMPXCHG
config ZONE_DMA
bool
config ZONE_DMA
bool