git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
configs
/
mpc832x_rdb_defconfig
diff --git
a/arch/powerpc/configs/mpc832x_rdb_defconfig
b/arch/powerpc/configs/mpc832x_rdb_defconfig
index
6d1c3e8
..
4f39102
100644
(file)
--- a/
arch/powerpc/configs/mpc832x_rdb_defconfig
+++ b/
arch/powerpc/configs/mpc832x_rdb_defconfig
@@
-87,8
+87,9
@@
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
# CONFIG_SLOB is not set
CONFIG_RT_MUTEXES=y
# CONFIG_TINY_SHMEM is not set