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/frv | |
| 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/frv')
| -rw-r--r-- | arch/frv/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index cb884e489425..bad27a6ff407 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig | |||
| @@ -7,6 +7,7 @@ config FRV | |||
| 7 | select HAVE_PERF_EVENTS | 7 | select HAVE_PERF_EVENTS |
| 8 | select HAVE_GENERIC_HARDIRQS | 8 | select HAVE_GENERIC_HARDIRQS |
| 9 | select GENERIC_IRQ_SHOW | 9 | select GENERIC_IRQ_SHOW |
| 10 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | ||
| 10 | 11 | ||
| 11 | config ZONE_DMA | 12 | config ZONE_DMA |
| 12 | bool | 13 | bool |