diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /arch/x86_64/defconfig | |
parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/x86_64/defconfig')
-rw-r--r-- | arch/x86_64/defconfig | 109 |
1 files changed, 78 insertions, 31 deletions
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index 5fb970715941..647610ecb580 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.18-rc4 | 3 | # Linux kernel version: 2.6.18-git5 |
4 | # Thu Aug 24 21:05:55 2006 | 4 | # Tue Sep 26 09:30:47 2006 |
5 | # | 5 | # |
6 | CONFIG_X86_64=y | 6 | CONFIG_X86_64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -19,6 +19,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
19 | CONFIG_GENERIC_IOMAP=y | 19 | CONFIG_GENERIC_IOMAP=y |
20 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 20 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
21 | CONFIG_DMI=y | 21 | CONFIG_DMI=y |
22 | CONFIG_AUDIT_ARCH=y | ||
22 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 23 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
23 | 24 | ||
24 | # | 25 | # |
@@ -38,16 +39,16 @@ CONFIG_SYSVIPC=y | |||
38 | CONFIG_POSIX_MQUEUE=y | 39 | CONFIG_POSIX_MQUEUE=y |
39 | # CONFIG_BSD_PROCESS_ACCT is not set | 40 | # CONFIG_BSD_PROCESS_ACCT is not set |
40 | # CONFIG_TASKSTATS is not set | 41 | # CONFIG_TASKSTATS is not set |
41 | CONFIG_SYSCTL=y | ||
42 | # CONFIG_AUDIT is not set | 42 | # CONFIG_AUDIT is not set |
43 | CONFIG_IKCONFIG=y | 43 | CONFIG_IKCONFIG=y |
44 | CONFIG_IKCONFIG_PROC=y | 44 | CONFIG_IKCONFIG_PROC=y |
45 | # CONFIG_CPUSETS is not set | 45 | # CONFIG_CPUSETS is not set |
46 | # CONFIG_RELAY is not set | 46 | # CONFIG_RELAY is not set |
47 | CONFIG_INITRAMFS_SOURCE="" | 47 | CONFIG_INITRAMFS_SOURCE="" |
48 | CONFIG_UID16=y | ||
49 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 48 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
50 | # CONFIG_EMBEDDED is not set | 49 | # CONFIG_EMBEDDED is not set |
50 | CONFIG_UID16=y | ||
51 | CONFIG_SYSCTL=y | ||
51 | CONFIG_KALLSYMS=y | 52 | CONFIG_KALLSYMS=y |
52 | CONFIG_KALLSYMS_ALL=y | 53 | CONFIG_KALLSYMS_ALL=y |
53 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 54 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -56,12 +57,12 @@ CONFIG_PRINTK=y | |||
56 | CONFIG_BUG=y | 57 | CONFIG_BUG=y |
57 | CONFIG_ELF_CORE=y | 58 | CONFIG_ELF_CORE=y |
58 | CONFIG_BASE_FULL=y | 59 | CONFIG_BASE_FULL=y |
59 | CONFIG_RT_MUTEXES=y | ||
60 | CONFIG_FUTEX=y | 60 | CONFIG_FUTEX=y |
61 | CONFIG_EPOLL=y | 61 | CONFIG_EPOLL=y |
62 | CONFIG_SHMEM=y | 62 | CONFIG_SHMEM=y |
63 | CONFIG_SLAB=y | 63 | CONFIG_SLAB=y |
64 | CONFIG_VM_EVENT_COUNTERS=y | 64 | CONFIG_VM_EVENT_COUNTERS=y |
65 | CONFIG_RT_MUTEXES=y | ||
65 | # CONFIG_TINY_SHMEM is not set | 66 | # CONFIG_TINY_SHMEM is not set |
66 | CONFIG_BASE_SMALL=0 | 67 | CONFIG_BASE_SMALL=0 |
67 | # CONFIG_SLOB is not set | 68 | # CONFIG_SLOB is not set |
@@ -160,6 +161,7 @@ CONFIG_X86_MCE_AMD=y | |||
160 | # CONFIG_CRASH_DUMP is not set | 161 | # CONFIG_CRASH_DUMP is not set |
161 | CONFIG_PHYSICAL_START=0x200000 | 162 | CONFIG_PHYSICAL_START=0x200000 |
162 | CONFIG_SECCOMP=y | 163 | CONFIG_SECCOMP=y |
164 | # CONFIG_CC_STACKPROTECTOR is not set | ||
163 | # CONFIG_HZ_100 is not set | 165 | # CONFIG_HZ_100 is not set |
164 | CONFIG_HZ_250=y | 166 | CONFIG_HZ_250=y |
165 | # CONFIG_HZ_1000 is not set | 167 | # CONFIG_HZ_1000 is not set |
@@ -307,18 +309,23 @@ CONFIG_IP_PNP_DHCP=y | |||
307 | CONFIG_INET_DIAG=y | 309 | CONFIG_INET_DIAG=y |
308 | CONFIG_INET_TCP_DIAG=y | 310 | CONFIG_INET_TCP_DIAG=y |
309 | # CONFIG_TCP_CONG_ADVANCED is not set | 311 | # CONFIG_TCP_CONG_ADVANCED is not set |
310 | CONFIG_TCP_CONG_BIC=y | 312 | CONFIG_TCP_CONG_CUBIC=y |
313 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
311 | CONFIG_IPV6=y | 314 | CONFIG_IPV6=y |
312 | # CONFIG_IPV6_PRIVACY is not set | 315 | # CONFIG_IPV6_PRIVACY is not set |
313 | # CONFIG_IPV6_ROUTER_PREF is not set | 316 | # CONFIG_IPV6_ROUTER_PREF is not set |
314 | # CONFIG_INET6_AH is not set | 317 | # CONFIG_INET6_AH is not set |
315 | # CONFIG_INET6_ESP is not set | 318 | # CONFIG_INET6_ESP is not set |
316 | # CONFIG_INET6_IPCOMP is not set | 319 | # CONFIG_INET6_IPCOMP is not set |
320 | # CONFIG_IPV6_MIP6 is not set | ||
317 | # CONFIG_INET6_XFRM_TUNNEL is not set | 321 | # CONFIG_INET6_XFRM_TUNNEL is not set |
318 | # CONFIG_INET6_TUNNEL is not set | 322 | # CONFIG_INET6_TUNNEL is not set |
319 | # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set | 323 | # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set |
320 | # CONFIG_INET6_XFRM_MODE_TUNNEL is not set | 324 | # CONFIG_INET6_XFRM_MODE_TUNNEL is not set |
325 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
321 | # CONFIG_IPV6_TUNNEL is not set | 326 | # CONFIG_IPV6_TUNNEL is not set |
327 | # CONFIG_IPV6_SUBTREES is not set | ||
328 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
322 | # CONFIG_NETWORK_SECMARK is not set | 329 | # CONFIG_NETWORK_SECMARK is not set |
323 | # CONFIG_NETFILTER is not set | 330 | # CONFIG_NETFILTER is not set |
324 | 331 | ||
@@ -345,7 +352,6 @@ CONFIG_IPV6=y | |||
345 | # CONFIG_ATALK is not set | 352 | # CONFIG_ATALK is not set |
346 | # CONFIG_X25 is not set | 353 | # CONFIG_X25 is not set |
347 | # CONFIG_LAPB is not set | 354 | # CONFIG_LAPB is not set |
348 | # CONFIG_NET_DIVERT is not set | ||
349 | # CONFIG_ECONET is not set | 355 | # CONFIG_ECONET is not set |
350 | # CONFIG_WAN_ROUTER is not set | 356 | # CONFIG_WAN_ROUTER is not set |
351 | 357 | ||
@@ -487,6 +493,7 @@ CONFIG_IDEDMA_AUTO=y | |||
487 | # | 493 | # |
488 | # CONFIG_RAID_ATTRS is not set | 494 | # CONFIG_RAID_ATTRS is not set |
489 | CONFIG_SCSI=y | 495 | CONFIG_SCSI=y |
496 | CONFIG_SCSI_NETLINK=y | ||
490 | # CONFIG_SCSI_PROC_FS is not set | 497 | # CONFIG_SCSI_PROC_FS is not set |
491 | 498 | ||
492 | # | 499 | # |
@@ -508,12 +515,13 @@ CONFIG_SCSI_CONSTANTS=y | |||
508 | # CONFIG_SCSI_LOGGING is not set | 515 | # CONFIG_SCSI_LOGGING is not set |
509 | 516 | ||
510 | # | 517 | # |
511 | # SCSI Transport Attributes | 518 | # SCSI Transports |
512 | # | 519 | # |
513 | CONFIG_SCSI_SPI_ATTRS=y | 520 | CONFIG_SCSI_SPI_ATTRS=y |
514 | CONFIG_SCSI_FC_ATTRS=y | 521 | CONFIG_SCSI_FC_ATTRS=y |
515 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 522 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
516 | CONFIG_SCSI_SAS_ATTRS=y | 523 | CONFIG_SCSI_SAS_ATTRS=y |
524 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
517 | 525 | ||
518 | # | 526 | # |
519 | # SCSI low-level drivers | 527 | # SCSI low-level drivers |
@@ -532,29 +540,14 @@ CONFIG_AIC79XX_RESET_DELAY_MS=4000 | |||
532 | # CONFIG_AIC79XX_DEBUG_ENABLE is not set | 540 | # CONFIG_AIC79XX_DEBUG_ENABLE is not set |
533 | CONFIG_AIC79XX_DEBUG_MASK=0 | 541 | CONFIG_AIC79XX_DEBUG_MASK=0 |
534 | # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set | 542 | # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set |
543 | # CONFIG_SCSI_AIC94XX is not set | ||
544 | # CONFIG_SCSI_ARCMSR is not set | ||
535 | CONFIG_MEGARAID_NEWGEN=y | 545 | CONFIG_MEGARAID_NEWGEN=y |
536 | CONFIG_MEGARAID_MM=y | 546 | CONFIG_MEGARAID_MM=y |
537 | CONFIG_MEGARAID_MAILBOX=y | 547 | CONFIG_MEGARAID_MAILBOX=y |
538 | # CONFIG_MEGARAID_LEGACY is not set | 548 | # CONFIG_MEGARAID_LEGACY is not set |
539 | CONFIG_MEGARAID_SAS=y | 549 | CONFIG_MEGARAID_SAS=y |
540 | CONFIG_SCSI_SATA=y | ||
541 | CONFIG_SCSI_SATA_AHCI=y | ||
542 | CONFIG_SCSI_SATA_SVW=y | ||
543 | CONFIG_SCSI_ATA_PIIX=y | ||
544 | # CONFIG_SCSI_SATA_MV is not set | ||
545 | CONFIG_SCSI_SATA_NV=y | ||
546 | # CONFIG_SCSI_PDC_ADMA is not set | ||
547 | # CONFIG_SCSI_HPTIOP is not set | 550 | # CONFIG_SCSI_HPTIOP is not set |
548 | # CONFIG_SCSI_SATA_QSTOR is not set | ||
549 | # CONFIG_SCSI_SATA_PROMISE is not set | ||
550 | # CONFIG_SCSI_SATA_SX4 is not set | ||
551 | CONFIG_SCSI_SATA_SIL=y | ||
552 | # CONFIG_SCSI_SATA_SIL24 is not set | ||
553 | # CONFIG_SCSI_SATA_SIS is not set | ||
554 | # CONFIG_SCSI_SATA_ULI is not set | ||
555 | CONFIG_SCSI_SATA_VIA=y | ||
556 | # CONFIG_SCSI_SATA_VITESSE is not set | ||
557 | CONFIG_SCSI_SATA_INTEL_COMBINED=y | ||
558 | # CONFIG_SCSI_BUSLOGIC is not set | 551 | # CONFIG_SCSI_BUSLOGIC is not set |
559 | # CONFIG_SCSI_DMX3191D is not set | 552 | # CONFIG_SCSI_DMX3191D is not set |
560 | # CONFIG_SCSI_EATA is not set | 553 | # CONFIG_SCSI_EATA is not set |
@@ -563,6 +556,7 @@ CONFIG_SCSI_SATA_INTEL_COMBINED=y | |||
563 | # CONFIG_SCSI_IPS is not set | 556 | # CONFIG_SCSI_IPS is not set |
564 | # CONFIG_SCSI_INITIO is not set | 557 | # CONFIG_SCSI_INITIO is not set |
565 | # CONFIG_SCSI_INIA100 is not set | 558 | # CONFIG_SCSI_INIA100 is not set |
559 | # CONFIG_SCSI_STEX is not set | ||
566 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 560 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
567 | # CONFIG_SCSI_IPR is not set | 561 | # CONFIG_SCSI_IPR is not set |
568 | # CONFIG_SCSI_QLOGIC_1280 is not set | 562 | # CONFIG_SCSI_QLOGIC_1280 is not set |
@@ -573,6 +567,62 @@ CONFIG_SCSI_SATA_INTEL_COMBINED=y | |||
573 | # CONFIG_SCSI_DEBUG is not set | 567 | # CONFIG_SCSI_DEBUG is not set |
574 | 568 | ||
575 | # | 569 | # |
570 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
571 | # | ||
572 | CONFIG_ATA=y | ||
573 | CONFIG_SATA_AHCI=y | ||
574 | CONFIG_SATA_SVW=y | ||
575 | CONFIG_ATA_PIIX=y | ||
576 | # CONFIG_SATA_MV is not set | ||
577 | CONFIG_SATA_NV=y | ||
578 | # CONFIG_PDC_ADMA is not set | ||
579 | # CONFIG_SATA_QSTOR is not set | ||
580 | # CONFIG_SATA_PROMISE is not set | ||
581 | # CONFIG_SATA_SX4 is not set | ||
582 | CONFIG_SATA_SIL=y | ||
583 | # CONFIG_SATA_SIL24 is not set | ||
584 | # CONFIG_SATA_SIS is not set | ||
585 | # CONFIG_SATA_ULI is not set | ||
586 | CONFIG_SATA_VIA=y | ||
587 | # CONFIG_SATA_VITESSE is not set | ||
588 | CONFIG_SATA_INTEL_COMBINED=y | ||
589 | # CONFIG_PATA_ALI is not set | ||
590 | # CONFIG_PATA_AMD is not set | ||
591 | # CONFIG_PATA_ARTOP is not set | ||
592 | # CONFIG_PATA_ATIIXP is not set | ||
593 | # CONFIG_PATA_CMD64X is not set | ||
594 | # CONFIG_PATA_CS5520 is not set | ||
595 | # CONFIG_PATA_CS5530 is not set | ||
596 | # CONFIG_PATA_CYPRESS is not set | ||
597 | # CONFIG_PATA_EFAR is not set | ||
598 | # CONFIG_ATA_GENERIC is not set | ||
599 | # CONFIG_PATA_HPT366 is not set | ||
600 | # CONFIG_PATA_HPT37X is not set | ||
601 | # CONFIG_PATA_HPT3X2N is not set | ||
602 | # CONFIG_PATA_HPT3X3 is not set | ||
603 | # CONFIG_PATA_IT821X is not set | ||
604 | # CONFIG_PATA_JMICRON is not set | ||
605 | # CONFIG_PATA_LEGACY is not set | ||
606 | # CONFIG_PATA_TRIFLEX is not set | ||
607 | # CONFIG_PATA_MPIIX is not set | ||
608 | # CONFIG_PATA_OLDPIIX is not set | ||
609 | # CONFIG_PATA_NETCELL is not set | ||
610 | # CONFIG_PATA_NS87410 is not set | ||
611 | # CONFIG_PATA_OPTI is not set | ||
612 | # CONFIG_PATA_OPTIDMA is not set | ||
613 | # CONFIG_PATA_PDC_OLD is not set | ||
614 | # CONFIG_PATA_QDI is not set | ||
615 | # CONFIG_PATA_RADISYS is not set | ||
616 | # CONFIG_PATA_RZ1000 is not set | ||
617 | # CONFIG_PATA_SC1200 is not set | ||
618 | # CONFIG_PATA_SERVERWORKS is not set | ||
619 | # CONFIG_PATA_PDC2027X is not set | ||
620 | # CONFIG_PATA_SIL680 is not set | ||
621 | # CONFIG_PATA_SIS is not set | ||
622 | # CONFIG_PATA_VIA is not set | ||
623 | # CONFIG_PATA_WINBOND is not set | ||
624 | |||
625 | # | ||
576 | # Multi-device support (RAID and LVM) | 626 | # Multi-device support (RAID and LVM) |
577 | # | 627 | # |
578 | CONFIG_MD=y | 628 | CONFIG_MD=y |
@@ -678,6 +728,7 @@ CONFIG_NET_PCI=y | |||
678 | # CONFIG_ADAPTEC_STARFIRE is not set | 728 | # CONFIG_ADAPTEC_STARFIRE is not set |
679 | CONFIG_B44=y | 729 | CONFIG_B44=y |
680 | CONFIG_FORCEDETH=y | 730 | CONFIG_FORCEDETH=y |
731 | # CONFIG_FORCEDETH_NAPI is not set | ||
681 | # CONFIG_DGRS is not set | 732 | # CONFIG_DGRS is not set |
682 | # CONFIG_EEPRO100 is not set | 733 | # CONFIG_EEPRO100 is not set |
683 | CONFIG_E100=y | 734 | CONFIG_E100=y |
@@ -714,6 +765,7 @@ CONFIG_E1000=y | |||
714 | # CONFIG_VIA_VELOCITY is not set | 765 | # CONFIG_VIA_VELOCITY is not set |
715 | CONFIG_TIGON3=y | 766 | CONFIG_TIGON3=y |
716 | CONFIG_BNX2=y | 767 | CONFIG_BNX2=y |
768 | # CONFIG_QLA3XXX is not set | ||
717 | 769 | ||
718 | # | 770 | # |
719 | # Ethernet (10000 Mbit) | 771 | # Ethernet (10000 Mbit) |
@@ -1036,6 +1088,7 @@ CONFIG_SOUND=y | |||
1036 | # Open Sound System | 1088 | # Open Sound System |
1037 | # | 1089 | # |
1038 | CONFIG_SOUND_PRIME=y | 1090 | CONFIG_SOUND_PRIME=y |
1091 | CONFIG_OSS_OBSOLETE_DRIVER=y | ||
1039 | # CONFIG_SOUND_BT878 is not set | 1092 | # CONFIG_SOUND_BT878 is not set |
1040 | # CONFIG_SOUND_EMU10K1 is not set | 1093 | # CONFIG_SOUND_EMU10K1 is not set |
1041 | # CONFIG_SOUND_FUSION is not set | 1094 | # CONFIG_SOUND_FUSION is not set |
@@ -1046,7 +1099,6 @@ CONFIG_SOUND_ICH=y | |||
1046 | # CONFIG_SOUND_MSNDPIN is not set | 1099 | # CONFIG_SOUND_MSNDPIN is not set |
1047 | # CONFIG_SOUND_VIA82CXXX is not set | 1100 | # CONFIG_SOUND_VIA82CXXX is not set |
1048 | # CONFIG_SOUND_OSS is not set | 1101 | # CONFIG_SOUND_OSS is not set |
1049 | # CONFIG_SOUND_TVMIXER is not set | ||
1050 | 1102 | ||
1051 | # | 1103 | # |
1052 | # USB support | 1104 | # USB support |
@@ -1203,7 +1255,6 @@ CONFIG_USB_MON=y | |||
1203 | # InfiniBand support | 1255 | # InfiniBand support |
1204 | # | 1256 | # |
1205 | # CONFIG_INFINIBAND is not set | 1257 | # CONFIG_INFINIBAND is not set |
1206 | # CONFIG_IPATH_CORE is not set | ||
1207 | 1258 | ||
1208 | # | 1259 | # |
1209 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1260 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
@@ -1449,10 +1500,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y | |||
1449 | # CONFIG_CRYPTO is not set | 1500 | # CONFIG_CRYPTO is not set |
1450 | 1501 | ||
1451 | # | 1502 | # |
1452 | # Hardware crypto devices | ||
1453 | # | ||
1454 | |||
1455 | # | ||
1456 | # Library routines | 1503 | # Library routines |
1457 | # | 1504 | # |
1458 | # CONFIG_CRC_CCITT is not set | 1505 | # CONFIG_CRC_CCITT is not set |