o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

1 files changed, 56 insertions, 33 deletions

diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 0a76f100f..35f1219fd 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -20,6 +20,30 @@ CONFIG_KMOD=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_AP1000 is not set
+
+#
+# Console drivers
+#
+CONFIG_PROM_CONSOLE=y
+CONFIG_FB=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FB_SBUS=y
+CONFIG_FB_CREATOR=y
+CONFIG_FB_CGSIX=y
+# CONFIG_FB_BWTWO is not set
+# CONFIG_FB_CGTHREE is not set
+# CONFIG_FB_LEO is not set
+CONFIG_FB_PCI=y
+CONFIG_FB_ATY=y
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FBCON_ADVANCED is not set
+CONFIG_FBCON_CFB8=y
+CONFIG_FBCON_CFB16=y
+CONFIG_FBCON_CFB24=y
+CONFIG_FBCON_CFB32=y
+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
@@ -31,20 +55,7 @@ CONFIG_SUN_CONSOLE=y
 CONFIG_SUN_AUXIO=y
 CONFIG_SUN_IO=y
 CONFIG_PCI=y
-
-#
-# SBUS Frame Buffer support
-#
-SUN_FBS_IN_PROCFS=y
-CONFIG_SUN_FB_DISPLAY=y
-SUN_FB_CGSIX=y
-SUN_FB_TCX=y
-SUN_FB_CGTHREE=y
-SUN_FB_CGFOURTEEN=y
-SUN_FB_BWTWO=y
-SUN_FB_LEO=y
-TADPOLE_FB_WEITEK=y
-SUN_FB_CREATOR=y
+CONFIG_PCI_CONSOLE=y
 
 #
 # Misc Linux/SPARC drivers
@@ -55,6 +66,13 @@ CONFIG_SAB82532=y
 CONFIG_OBP_FLASH=m
 # CONFIG_SUN_BPP is not set
 # CONFIG_SUN_VIDEOPIX is not set
+
+#
+# Linux/SPARC audio subsystem (EXPERIMENTAL)
+#
+# CONFIG_SPARCAUDIO is not set
+# CONFIG_SPARCAUDIO_AMD7930 is not set
+# CONFIG_SPARCAUDIO_CS4231 is not set
 CONFIG_SUN_OPENPROMFS=m
 CONFIG_PCI_OLD_PROC=y
 CONFIG_NET=y
@@ -64,7 +82,7 @@ CONFIG_SYSCTL=y
 CONFIG_SPARC32_COMPAT=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_ELF32=y
-CONFIG_BINFMT_AOUT32=y
+# CONFIG_BINFMT_AOUT32 is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_JAVA=m
 CONFIG_SOLARIS_EMUL=m
@@ -96,6 +114,7 @@ CONFIG_BLK_DEV_IDEFLOPPY=m
 # CONFIG_BLK_DEV_IDESCSI is not set
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_BLK_DEV_IDEDMA=y
+CONFIG_IDEDMA_AUTO=y
 CONFIG_BLK_DEV_NS87415=y
 CONFIG_BLK_DEV_CMD646=y
 
@@ -103,7 +122,9 @@ CONFIG_BLK_DEV_CMD646=y
 # Networking options
 #
 CONFIG_PACKET=y
-# CONFIG_NETLINK is not set
+CONFIG_NETLINK=y
+CONFIG_RTNETLINK=y
+# CONFIG_NETLINK_DEV is not set
 # CONFIG_FIREWALL is not set
 CONFIG_NET_ALIAS=y
 # CONFIG_FILTER is not set
@@ -112,11 +133,11 @@ CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_PNP is not set
-# CONFIG_IP_ACCT is not set
 # CONFIG_IP_ROUTER is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
 CONFIG_IP_ALIAS=y
+# CONFIG_ARPD is not set
 # CONFIG_SYN_COOKIES is not set
 
 #
@@ -132,29 +153,30 @@ CONFIG_IPV6=m
 #  
 #
 CONFIG_IPX=m
-
-#
-# IPX options
-#
 # CONFIG_IPX_INTERN is not set
+# CONFIG_SPX is not set
 CONFIG_ATALK=m
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_LLC is not set
+# CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 # CONFIG_NET_FASTROUTE is not set
 # CONFIG_NET_HW_FLOWCONTROL is not set
 # CONFIG_CPU_IS_SLOW is not set
 CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CBQ=y
-CONFIG_NET_SCH_CSZ=y
-CONFIG_NET_SCH_RED=y
-CONFIG_NET_SCH_SFQ=y
-CONFIG_NET_SCH_TBF=y
-CONFIG_NET_SCH_PFIFO=y
-CONFIG_NET_SCH_PRIO=y
-# CONFIG_NET_PROFILE is not set
+CONFIG_NETLINK=y
+CONFIG_RTNETLINK=y
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_CSZ=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+# CONFIG_NET_QOS is not set
+# CONFIG_NET_CLS is not set
 
 #
 # SCSI support
@@ -188,10 +210,10 @@ CONFIG_SCSI_AIC7XXX=y
 # CONFIG_AIC7XXX_PROC_STATS is not set
 CONFIG_AIC7XXX_RESET_DELAY=5
 CONFIG_SCSI_NCR53C8XX=y
-CONFIG_SCSI_NCR53C8XX_NVRAM_DETECT=y
-CONFIG_SCSI_NCR53C8XX_TAGGED_QUEUE=y
-CONFIG_SCSI_NCR53C8XX_MAX_TAGS=12
+CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
+CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
 CONFIG_SCSI_NCR53C8XX_SYNC=10
+# CONFIG_SCSI_NCR53C8XX_PROFILE is not set
 # CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT is not set
 
 #
@@ -228,6 +250,7 @@ CONFIG_HAPPYMEAL=y
 CONFIG_SUNQE=m
 CONFIG_MYRI_SBUS=m
 CONFIG_DE4X5=y
+CONFIG_VORTEX=m
 
 #
 # Filesystems
@@ -269,6 +292,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_SMD_DISKLABEL=y
 CONFIG_SOLARIS_X86_PARTITION=y
 # CONFIG_ADFS_FS is not set
+# CONFIG_DEVPTS_FS is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_NLS=y
 
@@ -310,6 +334,5 @@ CONFIG_NLS=y
 #
 # Kernel hacking
 #
-# CONFIG_PROFILE is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_EC_FLUSH_TRAP is not set