diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-02-04 05:49:23 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-02-05 03:15:12 -0500 |
commit | 7f7ff6bf0279ccb3d56f2b07c4cc88327c932a80 (patch) | |
tree | a32593c2b0f8c0429b6f61c965a65634d7936a38 | |
parent | 3794689dba4288f2ab6ec74657a07c41031ac376 (diff) |
[SPARC64]: Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc64/defconfig | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 9ceddad0fb49..bc56a7d88308 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.16-rc1 | 3 | # Linux kernel version: 2.6.16-rc2 |
4 | # Wed Jan 18 13:41:02 2006 | 4 | # Sat Feb 4 02:31:38 2006 |
5 | # | 5 | # |
6 | CONFIG_SPARC=y | 6 | CONFIG_SPARC=y |
7 | CONFIG_SPARC64=y | 7 | CONFIG_SPARC64=y |
@@ -23,7 +23,6 @@ CONFIG_HZ=250 | |||
23 | # Code maturity level options | 23 | # Code maturity level options |
24 | # | 24 | # |
25 | CONFIG_EXPERIMENTAL=y | 25 | CONFIG_EXPERIMENTAL=y |
26 | CONFIG_CLEAN_COMPILE=y | ||
27 | CONFIG_BROKEN_ON_SMP=y | 26 | CONFIG_BROKEN_ON_SMP=y |
28 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 27 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
29 | 28 | ||
@@ -155,6 +154,7 @@ CONFIG_NET=y | |||
155 | # | 154 | # |
156 | # Networking options | 155 | # Networking options |
157 | # | 156 | # |
157 | # CONFIG_NETDEBUG is not set | ||
158 | CONFIG_PACKET=y | 158 | CONFIG_PACKET=y |
159 | CONFIG_PACKET_MMAP=y | 159 | CONFIG_PACKET_MMAP=y |
160 | CONFIG_UNIX=y | 160 | CONFIG_UNIX=y |
@@ -224,6 +224,11 @@ CONFIG_IP_DCCP_TFRC_LIB=m | |||
224 | # SCTP Configuration (EXPERIMENTAL) | 224 | # SCTP Configuration (EXPERIMENTAL) |
225 | # | 225 | # |
226 | # CONFIG_IP_SCTP is not set | 226 | # CONFIG_IP_SCTP is not set |
227 | |||
228 | # | ||
229 | # TIPC Configuration (EXPERIMENTAL) | ||
230 | # | ||
231 | # CONFIG_TIPC is not set | ||
227 | # CONFIG_ATM is not set | 232 | # CONFIG_ATM is not set |
228 | # CONFIG_BRIDGE is not set | 233 | # CONFIG_BRIDGE is not set |
229 | CONFIG_VLAN_8021Q=m | 234 | CONFIG_VLAN_8021Q=m |
@@ -233,11 +238,6 @@ CONFIG_VLAN_8021Q=m | |||
233 | # CONFIG_ATALK is not set | 238 | # CONFIG_ATALK is not set |
234 | # CONFIG_X25 is not set | 239 | # CONFIG_X25 is not set |
235 | # CONFIG_LAPB is not set | 240 | # CONFIG_LAPB is not set |
236 | |||
237 | # | ||
238 | # TIPC Configuration (EXPERIMENTAL) | ||
239 | # | ||
240 | # CONFIG_TIPC is not set | ||
241 | # CONFIG_NET_DIVERT is not set | 241 | # CONFIG_NET_DIVERT is not set |
242 | # CONFIG_ECONET is not set | 242 | # CONFIG_ECONET is not set |
243 | # CONFIG_WAN_ROUTER is not set | 243 | # CONFIG_WAN_ROUTER is not set |
@@ -657,6 +657,7 @@ CONFIG_SERIAL_SUNSU_CONSOLE=y | |||
657 | CONFIG_SERIAL_SUNSAB=m | 657 | CONFIG_SERIAL_SUNSAB=m |
658 | CONFIG_SERIAL_CORE=y | 658 | CONFIG_SERIAL_CORE=y |
659 | CONFIG_SERIAL_CORE_CONSOLE=y | 659 | CONFIG_SERIAL_CORE_CONSOLE=y |
660 | # CONFIG_SERIAL_JSM is not set | ||
660 | CONFIG_UNIX98_PTYS=y | 661 | CONFIG_UNIX98_PTYS=y |
661 | # CONFIG_LEGACY_PTYS is not set | 662 | # CONFIG_LEGACY_PTYS is not set |
662 | 663 | ||
@@ -1118,6 +1119,10 @@ CONFIG_USB_HIDDEV=y | |||
1118 | # | 1119 | # |
1119 | 1120 | ||
1120 | # | 1121 | # |
1122 | # EDAC - error detection and reporting (RAS) | ||
1123 | # | ||
1124 | |||
1125 | # | ||
1121 | # Misc Linux/SPARC drivers | 1126 | # Misc Linux/SPARC drivers |
1122 | # | 1127 | # |
1123 | CONFIG_SUN_OPENPROMIO=m | 1128 | CONFIG_SUN_OPENPROMIO=m |