diff options
| author | Benjamin Herrenschmidt | 2010-08-04 02:26:03 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2010-08-04 02:26:03 +0200 |
| commit | 412a4ac5e9cf7fdeb6af562c25547a9b9da7674f (patch) | |
| tree | a8ce13cbc9c47c99799e5e3e3ad26ba78274ee73 /arch/powerpc/Kconfig | |
| parent | powerpc/kexec: Fix orphaned offline CPUs across kexec (diff) | |
| parent | powerpc/5200/i2c: improve i2c bus error recovery (diff) | |
| download | kernel-qcow2-linux-412a4ac5e9cf7fdeb6af562c25547a9b9da7674f.tar.gz kernel-qcow2-linux-412a4ac5e9cf7fdeb6af562c25547a9b9da7674f.tar.xz kernel-qcow2-linux-412a4ac5e9cf7fdeb6af562c25547a9b9da7674f.zip | |
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 4fa420381044..ae29761469b3 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -132,7 +132,7 @@ config PPC select HAVE_ARCH_KGDB select HAVE_KRETPROBES select HAVE_ARCH_TRACEHOOK - select HAVE_LMB + select HAVE_MEMBLOCK select HAVE_DMA_ATTRS select HAVE_DMA_API_DEBUG select USE_GENERIC_SMP_HELPERS if SMP |