diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /arch/sparc/Kconfig | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 ca5580e4d813..1666de84d477 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -29,6 +29,7 @@ config SPARC | |||
| 29 | select GENERIC_IRQ_SHOW | 29 | select GENERIC_IRQ_SHOW |
| 30 | select USE_GENERIC_SMP_HELPERS if SMP | 30 | select USE_GENERIC_SMP_HELPERS if SMP |
| 31 | select GENERIC_PCI_IOMAP | 31 | select GENERIC_PCI_IOMAP |
| 32 | select HAVE_NMI_WATCHDOG if SPARC64 | ||
| 32 | 33 | ||
| 33 | config SPARC32 | 34 | config SPARC32 |
| 34 | def_bool !64BIT | 35 | def_bool !64BIT |