summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/defconfig
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-22 23:05:57 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-22 23:05:57 +0000
commit51d3b7814cdccef9188240fe0cbd8d97ff2c7470 (patch)
tree5cbb01d0323d4f63ade66bdf48ba4a91aaa6df16 /arch/sparc64/defconfig
parent52273a23c9a84336b93a35e4847fc88fac7eb0e4 (diff)
Merge with Linux 2.3.7.
WARNING: 2.3.7 is known to eat filesystems for breakfast and little children for lunch, so if you try this on your machine make backups first ...
Diffstat (limited to 'arch/sparc64/defconfig')
-rw-r--r--arch/sparc64/defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 051c6560a..86eb05819 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -299,7 +299,6 @@ CONFIG_NFSD=m
CONFIG_SUNRPC=y
CONFIG_LOCKD=y
CONFIG_SMB_FS=m
-CONFIG_SMB_WIN95=y
CONFIG_NCP_FS=m
# CONFIG_NCPFS_PACKET_SIGNING is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set