summaryrefslogtreecommitdiffstats
path: root/arch/avr32
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-27 14:40:41 +0100
committerArnd Bergmann <arnd@arndb.de>2012-02-27 14:40:49 +0100
commit96a3eab338c01e172745b1686c51c1be96ce9ead (patch)
tree5a53947a192549d9edf63550258e1bddf6f1d794 /arch/avr32
parentMerge branch 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-a... (diff)
parentARM: Remove redundant ';' from avic_irq_set_priority() (diff)
downloadlinux-96a3eab338c01e172745b1686c51c1be96ce9ead.tar.xz
linux-96a3eab338c01e172745b1686c51c1be96ce9ead.zip
Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
* 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits) ARM: Remove redundant ';' from avic_irq_set_priority() ARM: mx3: Let mx31 and mx35 share the same CCM header file ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's Update to v3.3-rc3 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/avr32')
-rw-r--r--arch/avr32/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 197e96f70405..3dea7231f637 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -8,6 +8,7 @@ config AVR32
select HAVE_KPROBES
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_PROBE
+ select GENERIC_ATOMIC64
select HARDIRQS_SW_RESEND
select GENERIC_IRQ_SHOW
select ARCH_HAVE_NMI_SAFE_CMPXCHG