summaryrefslogtreecommitdiffstats
path: root/arch/parisc/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-08-08 08:20:26 +0200
committerDavid S. Miller <davem@davemloft.net>2011-08-08 08:20:26 +0200
commit19fd61785a580c60cba900c5171bfadb57dd5056 (patch)
tree1e491fb014be0dc03f4b6755bb94e73afd38c455 /arch/parisc/Kconfig
parentnetxen: add vlan LRO support (diff)
parentdp83640: increase receive time stamp buffer size (diff)
downloadlinux-19fd61785a580c60cba900c5171bfadb57dd5056.tar.xz
linux-19fd61785a580c60cba900c5171bfadb57dd5056.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/parisc/Kconfig')
-rw-r--r--arch/parisc/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 65adc86a230e..e077b0bf56ca 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -15,6 +15,7 @@ config PARISC
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_PROBE
select IRQ_PER_CPU
+ select ARCH_HAVE_NMI_SAFE_CMPXCHG
help
The PA-RISC microprocessor is designed by Hewlett-Packard and used