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/powerpc/Kconfig | |
| 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/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 374c475e56a3..6926b61acfea 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -136,6 +136,7 @@ config PPC | |||
| 136 | select HAVE_SYSCALL_TRACEPOINTS | 136 | select HAVE_SYSCALL_TRACEPOINTS |
| 137 | select HAVE_BPF_JIT if (PPC64 && NET) | 137 | select HAVE_BPF_JIT if (PPC64 && NET) |
| 138 | select HAVE_ARCH_JUMP_LABEL | 138 | select HAVE_ARCH_JUMP_LABEL |
| 139 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | ||
| 139 | 140 | ||
| 140 | config EARLY_PRINTK | 141 | config EARLY_PRINTK |
| 141 | bool | 142 | bool |