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
xfs: xfs_bmap_add_extent_delay_real should init br_startblock
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
configs
/
44x
/
canyonlands_defconfig
diff --git
a/arch/powerpc/configs/44x/canyonlands_defconfig
b/arch/powerpc/configs/44x/canyonlands_defconfig
index 45c64d818b2a066841905429ed5746d5c3c16ffa..17e4dd98eed7dc03fc5ac19eed4e2b73ab587ea8 100644
(file)
--- a/
arch/powerpc/configs/44x/canyonlands_defconfig
+++ b/
arch/powerpc/configs/44x/canyonlands_defconfig
@@
-42,6
+42,9
@@
CONFIG_MTD_PHYSMAP_OF=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_NDFC=y
CONFIG_PROC_DEVICETREE=y
+CONFIG_PM=y
+CONFIG_SUSPEND=y
+CONFIG_PPC4xx_CPM=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=35000
# CONFIG_MISC_DEVICES is not set