diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-03 20:26:03 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-03 20:26:03 -0400 |
| commit | 412a4ac5e9cf7fdeb6af562c25547a9b9da7674f (patch) | |
| tree | a8ce13cbc9c47c99799e5e3e3ad26ba78274ee73 /arch/powerpc/Kconfig | |
| parent | e8e5c2155b0035b6e04f29be67f6444bc914005b (diff) | |
| parent | 0c2daaafcdec726e89cbccca61d576de8429c537 (diff) | |
Merge commit 'gcl/next' into next
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 4fa42038104..ae29761469b 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -132,7 +132,7 @@ config PPC | |||
| 132 | select HAVE_ARCH_KGDB | 132 | select HAVE_ARCH_KGDB |
| 133 | select HAVE_KRETPROBES | 133 | select HAVE_KRETPROBES |
| 134 | select HAVE_ARCH_TRACEHOOK | 134 | select HAVE_ARCH_TRACEHOOK |
| 135 | select HAVE_LMB | 135 | select HAVE_MEMBLOCK |
| 136 | select HAVE_DMA_ATTRS | 136 | select HAVE_DMA_ATTRS |
| 137 | select HAVE_DMA_API_DEBUG | 137 | select HAVE_DMA_API_DEBUG |
| 138 | select USE_GENERIC_SMP_HELPERS if SMP | 138 | select USE_GENERIC_SMP_HELPERS if SMP |