From c7c4310f7fc1485925d800628bf50b3aeab535ef Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 10 Jul 2000 23:18:26 +0000 Subject: Merge with Linux 2.4.0-test3-pre8. Linus has accepted most of what I've sent him, so we're very close to full integration of the MIPS port into his sources. --- arch/mips64/defconfig-ip27 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'arch/mips64/defconfig-ip27') diff --git a/arch/mips64/defconfig-ip27 b/arch/mips64/defconfig-ip27 index ba39829fa..3af288cff 100644 --- a/arch/mips64/defconfig-ip27 +++ b/arch/mips64/defconfig-ip27 @@ -102,13 +102,9 @@ CONFIG_IP_PNP_BOOTP=y # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_IP_ALIAS is not set +# CONFIG_INET_ECN is not set # CONFIG_SYN_COOKIES is not set -# -# (it is safe to leave these untouched) -# -CONFIG_SKB_LARGE=y - # # # -- cgit v1.2.3