diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-29 05:27:07 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-29 05:27:07 +0000 |
| commit | a60c6812feb6ba35b5b8a9ee8a5ca3d01d1fcd5f (patch) | |
| tree | 2290ff15f280314a063f3dfc523742c8934c4259 /arch/sparc64 | |
| parent | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (diff) | |
Merge with Linux 2.4.0-test8-pre1.
Diffstat (limited to 'arch/sparc64')
| -rw-r--r-- | arch/sparc64/defconfig | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index cbbe20614..b2088bc86 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -158,11 +158,9 @@ CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_PNP is not set -# CONFIG_IP_ROUTER is not set # 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_INET_ECN=y # CONFIG_SYN_COOKIES is not set CONFIG_IPV6=m # CONFIG_IPV6_EUI64 is not set @@ -345,6 +343,7 @@ CONFIG_IEEE1394_RAWIO=m CONFIG_NETDEVICES=y CONFIG_DUMMY=m CONFIG_BONDING=m +CONFIG_TUN=m CONFIG_PPP=m # CONFIG_PPP_ASYNC is not set # CONFIG_PPP_SYNC_TTY is not set @@ -453,8 +452,7 @@ CONFIG_NFSD_V3=y CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_REMOTE="" +# CONFIG_SMB_FS is not set # CONFIG_NCP_FS is not set # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set |