diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-11-22 22:09:20 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-11-22 22:09:20 +0000 |
| commit | 55b467902c672d54e8c3751521589c13bae78071 (patch) | |
| tree | 61a7d78636fbda7930bbc8851b1294b2384063b9 /packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-collie | |
| parent | b9ffed91a607ceb3ab1761060e9cc1c176149b86 (diff) | |
| parent | 007b0f12cdf14948583d8c80bca970c115d70a69 (diff) | |
merge of 2d9229c5d5599b6452b58e1bd6237f75be857428
and 57be2e37d8f61e00f3da6c2d5362490f4071a500
Diffstat (limited to 'packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-collie')
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-collie | 45 |
1 files changed, 6 insertions, 39 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-collie b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-collie index 5dbd118cf1..354d0c2854 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-collie +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-collie @@ -153,7 +153,7 @@ CONFIG_PCMCIA_SA1100=y # # CONFIG_SMP is not set CONFIG_PREEMPT=y -# CONFIG_NO_IDLE_HZ is not set +CONFIG_NO_IDLE_HZ=y CONFIG_ARCH_DISCONTIGMEM_ENABLE=y CONFIG_SELECT_MEMORY_MODEL=y # CONFIG_FLATMEM_MANUAL is not set @@ -381,8 +381,8 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set @@ -511,7 +511,7 @@ CONFIG_PPP=m # CONFIG_PPP_FILTER is not set CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set -# CONFIG_PPP_DEFLATE is not set +CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m # CONFIG_PPPOE is not set # CONFIG_SLIP is not set @@ -661,41 +661,7 @@ CONFIG_I2C_ALGOBIT=m # # Hardware Monitoring support # -CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_HWMON is not set # # Misc devices @@ -893,6 +859,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y +CONFIG_JFFS2_SUMMARY=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=y # CONFIG_VXFS_FS is not set |