diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-28 16:04:12 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-03-28 16:04:12 +0000 |
| commit | f54bd12991023b60209135e7e77b86afa2b80b76 (patch) | |
| tree | b97769d104766c213609b5f7bc6c7fb514a2909a /packages/linux/linux-ixp4xx/nslu2 | |
| parent | a61d0ff5bdb2c9006f5e35d70cea3f74f66231d1 (diff) | |
| parent | aae834760ee0eb60cfa60353ad09c6b6431acee4 (diff) | |
merge of '9fdf613358c5efcdb75a30ee08729a9e2a7ade08'
and 'ee2aa51c8eb93fa5579f4cf49a53eb0cb3e90319'
Diffstat (limited to 'packages/linux/linux-ixp4xx/nslu2')
| -rw-r--r-- | packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 index 01f91b572a..2a382b34b3 100644 --- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 +++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 @@ -30,7 +30,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set @@ -217,7 +216,7 @@ CONFIG_PCI_SYSCALL=y CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y +# CONFIG_PREEMPT is not set CONFIG_HZ=100 CONFIG_AEABI=y CONFIG_OABI_COMPAT=y @@ -305,9 +304,26 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m -# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_ADVANCED=y +# CONFIG_TCP_CONG_BIC is not set CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_CONG_WESTWOOD is not set +# CONFIG_TCP_CONG_HTCP is not set +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +# CONFIG_DEFAULT_BIC is not set +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_RENO=y +CONFIG_DEFAULT_TCP_CONG="reno" # CONFIG_TCP_MD5SIG is not set # CONFIG_IP_VS is not set CONFIG_IPV6=m |