diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-12-09 14:36:59 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-12-09 14:36:59 +1100 |
| commit | 56d8adc5695a8d3f070c8498d532389580af5611 (patch) | |
| tree | bbcb6c38506af002e94e64df8ab1540e6aba7825 /arch/powerpc/configs/40x/kilauea_defconfig | |
| parent | f4b98415953dcf85bac4ea0a2264a3ead4a7bcc4 (diff) | |
| parent | ee2ffd8bbb2170f9b52fc8ff4aebe9702e0de651 (diff) | |
| download | op-kernel-dev-56d8adc5695a8d3f070c8498d532389580af5611.zip op-kernel-dev-56d8adc5695a8d3f070c8498d532389580af5611.tar.gz | |
Merge remote branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/configs/40x/kilauea_defconfig')
| -rw-r--r-- | arch/powerpc/configs/40x/kilauea_defconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig index 4e19ee7..34b8c1a 100644 --- a/arch/powerpc/configs/40x/kilauea_defconfig +++ b/arch/powerpc/configs/40x/kilauea_defconfig @@ -12,6 +12,8 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_KILAUEA=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y # CONFIG_WALNUT is not set CONFIG_SPARSE_IRQ=y CONFIG_PCI=y @@ -42,6 +44,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 |
