--- linux-2.2.19-spiffy-simple/.config	Fri Jun  8 22:22:54 2001
+++ linux-2.2.17-spiffy-simple/.config	Fri Jun  8 23:00:34 2001
@@ -20,18 +20,6 @@
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_SMP is not set
-CONFIG_SPARC64=y
-CONFIG_SBUS=y
-CONFIG_SBUSCHAR=y
-CONFIG_SUN_MOUSE=y
-CONFIG_SERIAL=y
-CONFIG_SUN_SERIAL=y
-CONFIG_SERIAL_CONSOLE=y
-CONFIG_SUN_KEYBOARD=y
-CONFIG_SUN_CONSOLE=y
-CONFIG_SUN_AUXIO=y
-CONFIG_SUN_IO=y
-# CONFIG_PCI is not set
 
 #
 # Console drivers
@@ -50,6 +38,17 @@
 CONFIG_FBCON_FONTWIDTH8_ONLY=y
 CONFIG_FONT_SUN8x16=y
 # CONFIG_FBCON_FONTS is not set
+CONFIG_SBUS=y
+CONFIG_SBUSCHAR=y
+CONFIG_SUN_MOUSE=y
+CONFIG_SERIAL=y
+CONFIG_SUN_SERIAL=y
+CONFIG_SERIAL_CONSOLE=y
+CONFIG_SUN_KEYBOARD=y
+CONFIG_SUN_CONSOLE=y
+CONFIG_SUN_AUXIO=y
+CONFIG_SUN_IO=y
+# CONFIG_PCI is not set
 
 #
 # Misc Linux/SPARC drivers
@@ -65,7 +64,9 @@
 # Linux/SPARC audio subsystem (EXPERIMENTAL)
 #
 # CONFIG_SPARCAUDIO is not set
+# CONFIG_SPARCAUDIO_AMD7930 is not set
 # CONFIG_SPARCAUDIO_CS4231 is not set
+# CONFIG_SPARCAUDIO_DBRI is not set
 # CONFIG_SPARCAUDIO_DUMMY is not set
 CONFIG_SUN_OPENPROMFS=m
 CONFIG_NET=y
@@ -130,7 +131,6 @@
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_BRIDGE is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_LLC is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
@@ -200,7 +200,6 @@
 CONFIG_SUNBMAC=m
 # CONFIG_SUNQE is not set
 # CONFIG_MYRI_SBUS is not set
-# CONFIG_FDDI is not set
 
 #
 # Unix 98 PTY support
@@ -214,12 +213,6 @@
 # CONFIG_VIDEO_DEV is not set
 
 #
-# XFree86 DRI support
-#
-# CONFIG_DRM is not set
-# CONFIG_DRM_FFB is not set
-
-#
 # Filesystems
 #
 # CONFIG_QUOTA is not set
@@ -251,14 +244,11 @@
 #
 # CONFIG_CODA_FS is not set
 CONFIG_NFS_FS=y
-# CONFIG_NFS_V3 is not set
 CONFIG_NFSD=m
-# CONFIG_NFSD_V3 is not set
-# CONFIG_NFSD_TCP is not set
+# CONFIG_NFSD_SUN is not set
 CONFIG_SUNRPC=y
 CONFIG_LOCKD=y
 CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
 # CONFIG_NCP_FS is not set
 
 #
@@ -266,7 +256,6 @@
 #
 CONFIG_BSD_DISKLABEL=y
 # CONFIG_MAC_PARTITION is not set
-# CONFIG_MINIX_SUBPARTITION is not set
 CONFIG_SMD_DISKLABEL=y
 CONFIG_SOLARIS_X86_PARTITION=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
@@ -308,7 +297,6 @@
 # CONFIG_NLS_ISO8859_14 is not set
 CONFIG_NLS_ISO8859_15=m
 # CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_RU is not set
 
 #
 # Watchdog