diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
| commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
| tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /arch/mips | |
| parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) | |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/defconfig | 1 | ||||
| -rw-r--r-- | arch/mips/defconfig-decstation | 1 | ||||
| -rw-r--r-- | arch/mips/defconfig-ip22 | 1 | ||||
| -rw-r--r-- | arch/mips/defconfig-rm200 | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index 9cb3b4cf0..2191e502a 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -264,7 +264,6 @@ CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_NFSD=y # CONFIG_NFSD_V3 is not set -# CONFIG_NFSD_TCP is not set CONFIG_SUNRPC=y CONFIG_LOCKD=y # CONFIG_SMB_FS is not set diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation index 2d4e2e521..add5390d8 100644 --- a/arch/mips/defconfig-decstation +++ b/arch/mips/defconfig-decstation @@ -261,7 +261,6 @@ CONFIG_EXT2_FS=y # CONFIG_ROOT_NFS is not set # CONFIG_NFSD is not set # CONFIG_NFSD_V3 is not set -# CONFIG_NFSD_TCP is not set # CONFIG_SUNRPC is not set # CONFIG_LOCKD is not set # CONFIG_SMB_FS is not set diff --git a/arch/mips/defconfig-ip22 b/arch/mips/defconfig-ip22 index 9cb3b4cf0..2191e502a 100644 --- a/arch/mips/defconfig-ip22 +++ b/arch/mips/defconfig-ip22 @@ -264,7 +264,6 @@ CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_NFSD=y # CONFIG_NFSD_V3 is not set -# CONFIG_NFSD_TCP is not set CONFIG_SUNRPC=y CONFIG_LOCKD=y # CONFIG_SMB_FS is not set diff --git a/arch/mips/defconfig-rm200 b/arch/mips/defconfig-rm200 index aba08c0de..545d3ea6d 100644 --- a/arch/mips/defconfig-rm200 +++ b/arch/mips/defconfig-rm200 @@ -280,7 +280,6 @@ CONFIG_EXT2_FS=y # CONFIG_ROOT_NFS is not set # CONFIG_NFSD is not set # CONFIG_NFSD_V3 is not set -# CONFIG_NFSD_TCP is not set # CONFIG_SUNRPC is not set # CONFIG_LOCKD is not set # CONFIG_SMB_FS is not set |