diff options
author | Andi Kleen <ak@suse.de> | 2006-02-03 15:50:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 19:43:12 -0500 |
commit | 2f01942536d8c686a3f6b3b38f1257caa2fb763e (patch) | |
tree | b2304fcb39d1709dd90061ac9be975a15a22beae | |
parent | 53ea68ecea11bcbb3451c2758ce181bd97b569a9 (diff) |
[PATCH] x86_64: Update defconfig
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/x86_64/defconfig | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index 09a3eb743315..56832929a543 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86_64/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.15-git12 | 3 | # Linux kernel version: 2.6.16-rc1-git2 |
4 | # Mon Jan 16 13:09:08 2006 | 4 | # Thu Jan 19 10:05:21 2006 |
5 | # | 5 | # |
6 | CONFIG_X86_64=y | 6 | CONFIG_X86_64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -310,6 +310,11 @@ CONFIG_IPV6=y | |||
310 | # SCTP Configuration (EXPERIMENTAL) | 310 | # SCTP Configuration (EXPERIMENTAL) |
311 | # | 311 | # |
312 | # CONFIG_IP_SCTP is not set | 312 | # CONFIG_IP_SCTP is not set |
313 | |||
314 | # | ||
315 | # TIPC Configuration (EXPERIMENTAL) | ||
316 | # | ||
317 | # CONFIG_TIPC is not set | ||
313 | # CONFIG_ATM is not set | 318 | # CONFIG_ATM is not set |
314 | # CONFIG_BRIDGE is not set | 319 | # CONFIG_BRIDGE is not set |
315 | # CONFIG_VLAN_8021Q is not set | 320 | # CONFIG_VLAN_8021Q is not set |
@@ -319,11 +324,6 @@ CONFIG_IPV6=y | |||
319 | # CONFIG_ATALK is not set | 324 | # CONFIG_ATALK is not set |
320 | # CONFIG_X25 is not set | 325 | # CONFIG_X25 is not set |
321 | # CONFIG_LAPB is not set | 326 | # CONFIG_LAPB is not set |
322 | |||
323 | # | ||
324 | # TIPC Configuration (EXPERIMENTAL) | ||
325 | # | ||
326 | # CONFIG_TIPC is not set | ||
327 | # CONFIG_NET_DIVERT is not set | 327 | # CONFIG_NET_DIVERT is not set |
328 | # CONFIG_ECONET is not set | 328 | # CONFIG_ECONET is not set |
329 | # CONFIG_WAN_ROUTER is not set | 329 | # CONFIG_WAN_ROUTER is not set |
@@ -1098,6 +1098,12 @@ CONFIG_USB_MON=y | |||
1098 | # | 1098 | # |
1099 | 1099 | ||
1100 | # | 1100 | # |
1101 | # EDAC - error detection and reporting (RAS) | ||
1102 | # | ||
1103 | # CONFIG_EDAC is not set | ||
1104 | # CONFIG_EDAC_POLL is not set | ||
1105 | |||
1106 | # | ||
1101 | # Firmware Drivers | 1107 | # Firmware Drivers |
1102 | # | 1108 | # |
1103 | # CONFIG_EDD is not set | 1109 | # CONFIG_EDD is not set |
@@ -1290,6 +1296,7 @@ CONFIG_DEBUG_FS=y | |||
1290 | # CONFIG_DEBUG_VM is not set | 1296 | # CONFIG_DEBUG_VM is not set |
1291 | # CONFIG_FRAME_POINTER is not set | 1297 | # CONFIG_FRAME_POINTER is not set |
1292 | # CONFIG_FORCED_INLINING is not set | 1298 | # CONFIG_FORCED_INLINING is not set |
1299 | # CONFIG_UNWIND_INFO is not set | ||
1293 | # CONFIG_RCU_TORTURE_TEST is not set | 1300 | # CONFIG_RCU_TORTURE_TEST is not set |
1294 | CONFIG_INIT_DEBUG=y | 1301 | CONFIG_INIT_DEBUG=y |
1295 | # CONFIG_DEBUG_RODATA is not set | 1302 | # CONFIG_DEBUG_RODATA is not set |