diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /arch/powerpc/Kconfig | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
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 1530a41fc56d..de88972c5896 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -115,6 +115,7 @@ config PPC | |||
| 115 | select HAVE_KRETPROBES | 115 | select HAVE_KRETPROBES |
| 116 | select HAVE_LMB | 116 | select HAVE_LMB |
| 117 | select HAVE_DMA_ATTRS if PPC64 | 117 | select HAVE_DMA_ATTRS if PPC64 |
| 118 | select USE_GENERIC_SMP_HELPERS if SMP | ||
| 118 | select HAVE_OPROFILE | 119 | select HAVE_OPROFILE |
| 119 | 120 | ||
| 120 | config EARLY_PRINTK | 121 | config EARLY_PRINTK |