o Merge with Linux 2.1.99.

 o Fix ancient bug in the ELF loader making ldd crash.
 o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.

1 files changed, 52 insertions, 7 deletions

diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig
index 38b6096cc..1abeca2d6 100644
--- a/arch/sparc/defconfig
+++ b/arch/sparc/defconfig
@@ -20,11 +20,13 @@ CONFIG_KMOD=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_AP1000 is not set
+# CONFIG_SUN4 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
@@ -80,6 +82,7 @@ CONFIG_MD_RAID5=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_NBD is not set
 
 #
 # Networking options
@@ -89,8 +92,8 @@ CONFIG_NETLINK=y
 CONFIG_RTNETLINK=y
 # CONFIG_NETLINK_DEV is not set
 CONFIG_FIREWALL=y
-# CONFIG_NET_SECURITY is not set
 CONFIG_NET_ALIAS=y
+# CONFIG_FILTER is not set
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -107,11 +110,18 @@ CONFIG_IP_MASQUERADE=y
 #
 # Protocol-specific masquerading support will be built as modules.
 #
+# CONFIG_IP_MASQUERADE_ICMP is not set
+
+#
+# Protocol-specific masquerading support will be built as modules.
+#
+# CONFIG_IP_MASQUERADE_IPAUTOFW is not set
+# CONFIG_IP_MASQUERADE_IPPORTFW is not set
 # CONFIG_IP_ROUTER is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
 # CONFIG_IP_MROUTE is not set
-CONFIG_IP_ALIAS=m
+CONFIG_IP_ALIAS=y
 # CONFIG_ARPD is not set
 # CONFIG_SYN_COOKIES is not set
 
@@ -123,31 +133,39 @@ CONFIG_IP_NOSR=y
 CONFIG_SKB_LARGE=y
 CONFIG_IPV6=m
 # CONFIG_IPV6_EUI64 is not set
-# CONFIG_IPV6_NO_PB is not set
 
 #
 #  
 #
 CONFIG_IPX=m
+
+#
+# IPX options
+#
 # CONFIG_IPX_INTERN is not set
-# CONFIG_IPX_PPROP_ROUTING is not set
 CONFIG_ATALK=m
-# CONFIG_AX25 is not set
 CONFIG_X25=m
 # CONFIG_LAPB is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_LLC 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=m
 CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_HFQ=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TBF=y
 CONFIG_NET_SCH_PFIFO=y
 CONFIG_NET_SCH_PRIO=y
+# CONFIG_NET_PROFILE is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
 
 #
 # SCSI support
@@ -176,6 +194,21 @@ CONFIG_SCSI_SUNESP=y
 CONFIG_SCSI_QLOGICPTI=m
 
 #
+# Fibre Channel support
+#
+CONFIG_FC4=m
+
+#
+# FC4 drivers
+#
+CONFIG_FC4_SOC=m
+
+#
+# FC4 targets
+#
+CONFIG_SCSI_PLUTO=m
+
+#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -193,6 +226,7 @@ CONFIG_SUNLANCE=y
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNQE=m
 CONFIG_MYRI_SBUS=m
+CONFIG_CDROM=y
 
 #
 # Filesystems
@@ -211,24 +245,35 @@ CONFIG_NFS_FS=y
 CONFIG_NFSD=m
 CONFIG_SUNRPC=y
 CONFIG_LOCKD=y
+# CONFIG_CODA_FS is not set
 CONFIG_SMB_FS=m
 CONFIG_SMB_WIN95=y
 CONFIG_NCP_FS=m
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_MOUNT_SUBDIR is not set
 CONFIG_HPFS_FS=m
+# CONFIG_NTFS_FS is not set
 CONFIG_SYSV_FS=m
 CONFIG_AFFS_FS=m
+# CONFIG_HFS_FS is not set
 CONFIG_ROMFS_FS=m
 CONFIG_AUTOFS_FS=m
 CONFIG_AMIGA_PARTITION=y
 CONFIG_UFS_FS=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_SMD_DISKLABEL=y
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_ADFS_FS is not set
 # CONFIG_MAC_PARTITION is not set
+CONFIG_NLS=y
 
 #
 # Native Language Support
 #
-CONFIG_NLS=y
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set