diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-03 11:41:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-03 11:41:30 +0000 |
| commit | 972f72f4e47196817b8a3fc62a9e9dd188490f81 (patch) | |
| tree | 77d115be3d0a03cf9b86de1a70d30330e4d236dc /packages/linux/linux-rp-2.6.24/defconfig-collie | |
| parent | b4db5d7f3e1a0470f2111508e2b701acee95055e (diff) | |
| parent | 915c1e3654c4be1667a9390c3671d1a3601e2a56 (diff) | |
merge of '6c9b3832ef2260eb1b3a74e74b1d73166ab79d89'
and 'f275c97e2c93f0e846205b213e997b28ed0b148e'
Diffstat (limited to 'packages/linux/linux-rp-2.6.24/defconfig-collie')
| -rw-r--r-- | packages/linux/linux-rp-2.6.24/defconfig-collie | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-collie b/packages/linux/linux-rp-2.6.24/defconfig-collie index 847fef882c..4d3f9f8782 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-collie +++ b/packages/linux/linux-rp-2.6.24/defconfig-collie @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -221,7 +221,8 @@ CONFIG_PCMCIA_SA1100=m CONFIG_PREEMPT=y CONFIG_NO_IDLE_HZ=y CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y CONFIG_ARCH_DISCONTIGMEM_ENABLE=y CONFIG_NODES_SHIFT=2 CONFIG_SELECT_MEMORY_MODEL=y @@ -326,6 +327,7 @@ CONFIG_INET_TCP_DIAG=m CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set +# CONFIG_IP_VS is not set CONFIG_IPV6=m # CONFIG_IPV6_PRIVACY is not set # CONFIG_IPV6_ROUTER_PREF is not set @@ -1058,7 +1060,7 @@ CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_UNSAFE_RESUME=y # # MMC/SD Card Drivers @@ -1308,7 +1310,7 @@ CONFIG_INSTRUMENTATION=y # CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set |