From 7acb77a6e7bddd4c4c5aa975bbf976927c013798 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 17 Jun 1997 13:20:30 +0000
Subject: Merge with 2.1.43.

---
 arch/sparc/defconfig | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'arch/sparc/defconfig')

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
-- 
cgit v1.2.3