git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
configs
/
cell_defconfig
diff --git
a/arch/powerpc/configs/cell_defconfig
b/arch/powerpc/configs/cell_defconfig
index e956548da00ce6276c5343d7200e1fae39676bd4..24367319ce24ac873bb279fb83d00e614f37fbb7 100644
(file)
--- a/
arch/powerpc/configs/cell_defconfig
+++ b/
arch/powerpc/configs/cell_defconfig
@@
-147,6
+147,7
@@
CONFIG_PPC_RTAS=y
# CONFIG_RTAS_ERROR_LOGGING is not set
CONFIG_RTAS_PROC=y
CONFIG_RTAS_FLASH=y
+CONFIG_PPC_PMI=m
CONFIG_MMIO_NVRAM=y
# CONFIG_PPC_MPC106 is not set
# CONFIG_PPC_970_NAP is not set