From dcec8a13bf565e47942a1751a9cec21bec5648fe Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 7 May 1998 02:55:41 +0000 Subject: 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. --- arch/sparc64/defconfig | 58 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 13 deletions(-) (limited to 'arch/sparc64/defconfig') diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index f3c2e2ca4..0a76f100f 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -25,12 +25,12 @@ 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=y -CONFIG_PCI_OLD_PROC=y # # SBUS Frame Buffer support @@ -52,10 +52,11 @@ SUN_FB_CREATOR=y CONFIG_SUN_OPENPROMIO=m CONFIG_SUN_MOSTEK_RTC=y CONFIG_SAB82532=y -# CONFIG_OBP_FLASH is not set +CONFIG_OBP_FLASH=m # CONFIG_SUN_BPP is not set # CONFIG_SUN_VIDEOPIX is not set CONFIG_SUN_OPENPROMFS=m +CONFIG_PCI_OLD_PROC=y CONFIG_NET=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set @@ -67,11 +68,12 @@ CONFIG_BINFMT_AOUT32=y CONFIG_BINFMT_MISC=m CONFIG_BINFMT_JAVA=m CONFIG_SOLARIS_EMUL=m -CONFIG_MATHEMU=m CONFIG_PARPORT=y CONFIG_PARPORT_AX=y +# CONFIG_PARPORT_OTHER is not set CONFIG_PRINTER=y CONFIG_PRINTER_READBACK=y +CONFIG_ENVCTRL=y # # Floppy, IDE, and other block devices @@ -92,8 +94,10 @@ CONFIG_BLK_DEV_IDECD=y CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m # CONFIG_BLK_DEV_IDESCSI is not set -CONFIG_IDE_CHIPSETS=y -CONFIG_BLK_DEV_NS87415_AX=y +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_BLK_DEV_IDEDMA=y +CONFIG_BLK_DEV_NS87415=y +CONFIG_BLK_DEV_CMD646=y # # Networking options @@ -101,18 +105,18 @@ CONFIG_BLK_DEV_NS87415_AX=y CONFIG_PACKET=y # CONFIG_NETLINK is not set # CONFIG_FIREWALL is not set -# CONFIG_NET_ALIAS is not set +CONFIG_NET_ALIAS=y +# CONFIG_FILTER is not set CONFIG_UNIX=y 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_MASQUERADE is not set # CONFIG_IP_ROUTER is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set -# CONFIG_IP_ALIAS is not set +CONFIG_IP_ALIAS=y # CONFIG_SYN_COOKIES is not set # @@ -123,30 +127,34 @@ 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_ATALK=m -# CONFIG_AX25 is not set # CONFIG_X25 is not set # 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=y CONFIG_NET_SCH_CSZ=y -CONFIG_NET_SCH_HFQ=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 # # SCSI support @@ -186,6 +194,21 @@ CONFIG_SCSI_NCR53C8XX_MAX_TAGS=12 CONFIG_SCSI_NCR53C8XX_SYNC=10 # CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT is not set +# +# Fibre Channel support +# +CONFIG_FC4=m + +# +# FC4 drivers +# +CONFIG_FC4_SOC=m + +# +# FC4 targets +# +CONFIG_SCSI_PLUTO=m + # # Network device support # @@ -205,7 +228,6 @@ CONFIG_HAPPYMEAL=y CONFIG_SUNQE=m CONFIG_MYRI_SBUS=m CONFIG_DE4X5=y -CONFIG_CDROM=y # # Filesystems @@ -228,21 +250,31 @@ CONFIG_LOCKD=y 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=m CONFIG_BSD_DISKLABEL=y CONFIG_SMD_DISKLABEL=y +CONFIG_SOLARIS_X86_PARTITION=y +# 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 -- cgit v1.2.3