diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 00:01:51 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 00:01:51 -0800 |
commit | 2054271bb008de0bcf0bdc5d6041613f616420f2 (patch) | |
tree | 24e638944597399d28c0432a5f6a323d3181c8a6 /arch/sparc/Kconfig | |
parent | 12480c2e53d355223cf6884ed1f56e6ac9b7c21f (diff) | |
parent | 8757e168190a6ed2cd4aa23fc59bf86b0091b596 (diff) |
Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical
From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
ARM: pxa: fix pxa25x gpio wakeup setting
+ Linux 3.7-rc6
Diffstat (limited to 'arch/sparc/Kconfig')
-rw-r--r-- | arch/sparc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index b6b442b0d793..9f2edb5c5551 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -20,6 +20,7 @@ config SPARC select HAVE_ARCH_TRACEHOOK select SYSCTL_EXCEPTION_TRACE select ARCH_WANT_OPTIONAL_GPIOLIB + select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select RTC_CLASS select RTC_DRV_M48T59 select HAVE_IRQ_WORK |