diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
| commit | 7acb77a6e7bddd4c4c5aa975bbf976927c013798 (patch) | |
| tree | 4139829ec6edb85f73774bb95cdec376758bfc73 /arch/sparc | |
| parent | 64d58d4c8cd6a89ee218301ec0dc0ebfec91a4db (diff) | |
Merge with 2.1.43.
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/config.in | 1 | ||||
| -rw-r--r-- | arch/sparc/defconfig | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/sparc/config.in b/arch/sparc/config.in index 0005004be..85566667f 100644 --- a/arch/sparc/config.in +++ b/arch/sparc/config.in @@ -54,6 +54,7 @@ bool 'Sysctl support' CONFIG_SYSCTL tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC tristate 'Kernel support for JAVA binaries' CONFIG_BINFMT_JAVA fi endmenu diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig index ff91819b0..a6df2dcc0 100644 --- a/arch/sparc/defconfig +++ b/arch/sparc/defconfig @@ -42,6 +42,7 @@ SUN_FB_CGFOURTEEN=y SUN_FB_BWTWO=y SUN_FB_LEO=y TADPOLE_FB_WEITEK=y +SUN_FB_CREATOR=y # # Misc Linux/SPARC drivers @@ -177,6 +178,9 @@ CONFIG_MYRI_SBUS=m # Filesystems # CONFIG_QUOTA=y +# CONFIG_DCACHE_PRELOAD is not set +# CONFIG_OMIRR is not set +# CONFIG_TRANS_NAMES is not set CONFIG_MINIX_FS=m CONFIG_EXT2_FS=y CONFIG_FAT_FS=m |