diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
| commit | c7c4310f7fc1485925d800628bf50b3aeab535ef (patch) | |
| tree | b12aa4be0e8fb82aaaea97fb475e793e8a347c49 /arch/mips64 | |
| parent | 1ffd1d069ca4c5ffe16fea6175dab1b9bbb15820 (diff) | |
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.
Diffstat (limited to 'arch/mips64')
| -rw-r--r-- | arch/mips64/defconfig | 6 | ||||
| -rw-r--r-- | arch/mips64/defconfig-ip22 | 6 | ||||
| -rw-r--r-- | arch/mips64/defconfig-ip27 | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/arch/mips64/defconfig b/arch/mips64/defconfig index ba39829fa..3af288cff 100644 --- a/arch/mips64/defconfig +++ b/arch/mips64/defconfig @@ -102,14 +102,10 @@ 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 - -# # # # CONFIG_IPX is not set diff --git a/arch/mips64/defconfig-ip22 b/arch/mips64/defconfig-ip22 index ef422eb5b..a40dc4eb0 100644 --- a/arch/mips64/defconfig-ip22 +++ b/arch/mips64/defconfig-ip22 @@ -92,14 +92,10 @@ 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 - -# # # # CONFIG_IPX is not set 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,14 +102,10 @@ 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 - -# # # # CONFIG_IPX is not set |