diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
| commit | b8553086288629b4efb77e97f5582e08bc50ad65 (patch) | |
| tree | 0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /arch/sparc64/defconfig | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'arch/sparc64/defconfig')
| -rw-r--r-- | arch/sparc64/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index d4a7c4b53..7ecaa1a9f 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -85,6 +85,7 @@ CONFIG_FB_PM2_PCI=y CONFIG_FB_ATY=y # CONFIG_FB_ATY128 is not set # CONFIG_FB_3DFX is not set +# CONFIG_FB_SIS is not set CONFIG_FB_SBUS=y CONFIG_FB_CREATOR=y CONFIG_FB_CGSIX=y @@ -429,7 +430,6 @@ CONFIG_NFS_V3=y # CONFIG_ROOT_NFS is not set CONFIG_NFSD=m CONFIG_NFSD_V3=y -# CONFIG_NFSD_TCP is not set CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y |