From: David S. Miller Date: Sat, 4 Feb 2006 10:49:23 +0000 (-0800) Subject: [SPARC64]: Update defconfig. X-Git-Tag: v2.6.16-rc3~145^2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f7ff6bf0279ccb3d56f2b07c4cc88327c932a80;p=linux-2.6 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller --- diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 9ceddad0fb..bc56a7d883 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-rc1 -# Wed Jan 18 13:41:02 2006 +# Linux kernel version: 2.6.16-rc2 +# Sat Feb 4 02:31:38 2006 # CONFIG_SPARC=y CONFIG_SPARC64=y @@ -23,7 +23,6 @@ CONFIG_HZ=250 # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 @@ -155,6 +154,7 @@ CONFIG_NET=y # # Networking options # +# CONFIG_NETDEBUG is not set CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y @@ -224,6 +224,11 @@ CONFIG_IP_DCCP_TFRC_LIB=m # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set CONFIG_VLAN_8021Q=m @@ -233,11 +238,6 @@ CONFIG_VLAN_8021Q=m # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# -# CONFIG_TIPC is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -657,6 +657,7 @@ CONFIG_SERIAL_SUNSU_CONSOLE=y CONFIG_SERIAL_SUNSAB=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set @@ -1117,6 +1118,10 @@ CONFIG_USB_HIDDEV=y # SN Devices # +# +# EDAC - error detection and reporting (RAS) +# + # # Misc Linux/SPARC drivers #