diff options
| author | Len Brown <len.brown@intel.com> | 2011-08-03 11:30:42 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-08-03 11:30:42 -0400 |
| commit | d0e323b47057f4492b8fa22345f38d80a469bf8d (patch) | |
| tree | feb760c7e2cdb1e43640417409428ab858910ea3 /arch/alpha | |
| parent | c027a474a68065391c8773f6e83ed5412657e369 (diff) | |
| parent | c3e6088e1036f8084bc7444b38437da136b7588b (diff) | |
Merge branch 'apei' into apei-release
Some trivial conflicts due to other various merges
adding to the end of common lists sooner than this one.
arch/ia64/Kconfig
arch/powerpc/Kconfig
arch/x86/Kconfig
lib/Kconfig
lib/Makefile
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index ca2da8da6e9c..60cde53d266c 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig | |||
| @@ -14,6 +14,7 @@ config ALPHA | |||
| 14 | select AUTO_IRQ_AFFINITY if SMP | 14 | select AUTO_IRQ_AFFINITY if SMP |
| 15 | select GENERIC_IRQ_SHOW | 15 | select GENERIC_IRQ_SHOW |
| 16 | select ARCH_WANT_OPTIONAL_GPIOLIB | 16 | select ARCH_WANT_OPTIONAL_GPIOLIB |
| 17 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | ||
| 17 | help | 18 | help |
| 18 | The Alpha is a 64-bit general-purpose processor designed and | 19 | The Alpha is a 64-bit general-purpose processor designed and |
| 19 | marketed by the Digital Equipment Corporation of blessed memory, | 20 | marketed by the Digital Equipment Corporation of blessed memory, |