diff options
author | Andi Kleen <ak@suse.de> | 2006-08-30 13:37:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-30 19:05:15 -0400 |
commit | ddcf36511d213501a035f168334046ba30a61a11 (patch) | |
tree | e1cd6cf6026293b8d0f94aa2f16fc1c4f77e5443 /arch/x86_64/defconfig | |
parent | df31405a9a240e8ea882953ea90736ff57b47643 (diff) |
[PATCH] x86_64: Update defconfig
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/defconfig')
-rw-r--r-- | arch/x86_64/defconfig | 66 |
1 files changed, 16 insertions, 50 deletions
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index 840d5d93d5cc..5fb970715941 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-rc2 | 3 | # Linux kernel version: 2.6.18-rc4 |
4 | # Tue Jul 18 17:13:20 2006 | 4 | # Thu Aug 24 21:05:55 2006 |
5 | # | 5 | # |
6 | CONFIG_X86_64=y | 6 | CONFIG_X86_64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -201,7 +201,7 @@ CONFIG_ACPI_THERMAL=y | |||
201 | CONFIG_ACPI_NUMA=y | 201 | CONFIG_ACPI_NUMA=y |
202 | # CONFIG_ACPI_ASUS is not set | 202 | # CONFIG_ACPI_ASUS is not set |
203 | # CONFIG_ACPI_IBM is not set | 203 | # CONFIG_ACPI_IBM is not set |
204 | CONFIG_ACPI_TOSHIBA=y | 204 | # CONFIG_ACPI_TOSHIBA is not set |
205 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 205 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
206 | # CONFIG_ACPI_DEBUG is not set | 206 | # CONFIG_ACPI_DEBUG is not set |
207 | CONFIG_ACPI_EC=y | 207 | CONFIG_ACPI_EC=y |
@@ -216,7 +216,7 @@ CONFIG_ACPI_CONTAINER=y | |||
216 | # | 216 | # |
217 | CONFIG_CPU_FREQ=y | 217 | CONFIG_CPU_FREQ=y |
218 | CONFIG_CPU_FREQ_TABLE=y | 218 | CONFIG_CPU_FREQ_TABLE=y |
219 | # CONFIG_CPU_FREQ_DEBUG is not set | 219 | CONFIG_CPU_FREQ_DEBUG=y |
220 | CONFIG_CPU_FREQ_STAT=y | 220 | CONFIG_CPU_FREQ_STAT=y |
221 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 221 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set |
222 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 222 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y |
@@ -495,8 +495,9 @@ CONFIG_SCSI=y | |||
495 | CONFIG_BLK_DEV_SD=y | 495 | CONFIG_BLK_DEV_SD=y |
496 | # CONFIG_CHR_DEV_ST is not set | 496 | # CONFIG_CHR_DEV_ST is not set |
497 | # CONFIG_CHR_DEV_OSST is not set | 497 | # CONFIG_CHR_DEV_OSST is not set |
498 | # CONFIG_BLK_DEV_SR is not set | 498 | CONFIG_BLK_DEV_SR=y |
499 | # CONFIG_CHR_DEV_SG is not set | 499 | # CONFIG_BLK_DEV_SR_VENDOR is not set |
500 | CONFIG_CHR_DEV_SG=y | ||
500 | # CONFIG_CHR_DEV_SCH is not set | 501 | # CONFIG_CHR_DEV_SCH is not set |
501 | 502 | ||
502 | # | 503 | # |
@@ -512,7 +513,7 @@ CONFIG_SCSI_CONSTANTS=y | |||
512 | CONFIG_SCSI_SPI_ATTRS=y | 513 | CONFIG_SCSI_SPI_ATTRS=y |
513 | CONFIG_SCSI_FC_ATTRS=y | 514 | CONFIG_SCSI_FC_ATTRS=y |
514 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 515 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
515 | # CONFIG_SCSI_SAS_ATTRS is not set | 516 | CONFIG_SCSI_SAS_ATTRS=y |
516 | 517 | ||
517 | # | 518 | # |
518 | # SCSI low-level drivers | 519 | # SCSI low-level drivers |
@@ -538,7 +539,7 @@ CONFIG_MEGARAID_MAILBOX=y | |||
538 | CONFIG_MEGARAID_SAS=y | 539 | CONFIG_MEGARAID_SAS=y |
539 | CONFIG_SCSI_SATA=y | 540 | CONFIG_SCSI_SATA=y |
540 | CONFIG_SCSI_SATA_AHCI=y | 541 | CONFIG_SCSI_SATA_AHCI=y |
541 | # CONFIG_SCSI_SATA_SVW is not set | 542 | CONFIG_SCSI_SATA_SVW=y |
542 | CONFIG_SCSI_ATA_PIIX=y | 543 | CONFIG_SCSI_ATA_PIIX=y |
543 | # CONFIG_SCSI_SATA_MV is not set | 544 | # CONFIG_SCSI_SATA_MV is not set |
544 | CONFIG_SCSI_SATA_NV=y | 545 | CONFIG_SCSI_SATA_NV=y |
@@ -589,7 +590,7 @@ CONFIG_BLK_DEV_DM=y | |||
589 | CONFIG_FUSION=y | 590 | CONFIG_FUSION=y |
590 | CONFIG_FUSION_SPI=y | 591 | CONFIG_FUSION_SPI=y |
591 | # CONFIG_FUSION_FC is not set | 592 | # CONFIG_FUSION_FC is not set |
592 | # CONFIG_FUSION_SAS is not set | 593 | CONFIG_FUSION_SAS=y |
593 | CONFIG_FUSION_MAX_SGE=128 | 594 | CONFIG_FUSION_MAX_SGE=128 |
594 | # CONFIG_FUSION_CTL is not set | 595 | # CONFIG_FUSION_CTL is not set |
595 | 596 | ||
@@ -675,7 +676,7 @@ CONFIG_NET_PCI=y | |||
675 | # CONFIG_PCNET32 is not set | 676 | # CONFIG_PCNET32 is not set |
676 | # CONFIG_AMD8111_ETH is not set | 677 | # CONFIG_AMD8111_ETH is not set |
677 | # CONFIG_ADAPTEC_STARFIRE is not set | 678 | # CONFIG_ADAPTEC_STARFIRE is not set |
678 | # CONFIG_B44 is not set | 679 | CONFIG_B44=y |
679 | CONFIG_FORCEDETH=y | 680 | CONFIG_FORCEDETH=y |
680 | # CONFIG_DGRS is not set | 681 | # CONFIG_DGRS is not set |
681 | # CONFIG_EEPRO100 is not set | 682 | # CONFIG_EEPRO100 is not set |
@@ -712,7 +713,7 @@ CONFIG_E1000=y | |||
712 | # CONFIG_SK98LIN is not set | 713 | # CONFIG_SK98LIN is not set |
713 | # CONFIG_VIA_VELOCITY is not set | 714 | # CONFIG_VIA_VELOCITY is not set |
714 | CONFIG_TIGON3=y | 715 | CONFIG_TIGON3=y |
715 | # CONFIG_BNX2 is not set | 716 | CONFIG_BNX2=y |
716 | 717 | ||
717 | # | 718 | # |
718 | # Ethernet (10000 Mbit) | 719 | # Ethernet (10000 Mbit) |
@@ -842,44 +843,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
842 | # | 843 | # |
843 | # Watchdog Cards | 844 | # Watchdog Cards |
844 | # | 845 | # |
845 | CONFIG_WATCHDOG=y | 846 | # CONFIG_WATCHDOG is not set |
846 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
847 | |||
848 | # | ||
849 | # Watchdog Device Drivers | ||
850 | # | ||
851 | CONFIG_SOFT_WATCHDOG=y | ||
852 | # CONFIG_ACQUIRE_WDT is not set | ||
853 | # CONFIG_ADVANTECH_WDT is not set | ||
854 | # CONFIG_ALIM1535_WDT is not set | ||
855 | # CONFIG_ALIM7101_WDT is not set | ||
856 | # CONFIG_SC520_WDT is not set | ||
857 | # CONFIG_EUROTECH_WDT is not set | ||
858 | # CONFIG_IB700_WDT is not set | ||
859 | # CONFIG_IBMASR is not set | ||
860 | # CONFIG_WAFER_WDT is not set | ||
861 | # CONFIG_I6300ESB_WDT is not set | ||
862 | # CONFIG_I8XX_TCO is not set | ||
863 | # CONFIG_SC1200_WDT is not set | ||
864 | # CONFIG_60XX_WDT is not set | ||
865 | # CONFIG_SBC8360_WDT is not set | ||
866 | # CONFIG_CPU5_WDT is not set | ||
867 | # CONFIG_W83627HF_WDT is not set | ||
868 | # CONFIG_W83877F_WDT is not set | ||
869 | # CONFIG_W83977F_WDT is not set | ||
870 | # CONFIG_MACHZ_WDT is not set | ||
871 | # CONFIG_SBC_EPX_C3_WATCHDOG is not set | ||
872 | |||
873 | # | ||
874 | # PCI-based Watchdog Cards | ||
875 | # | ||
876 | # CONFIG_PCIPCWATCHDOG is not set | ||
877 | # CONFIG_WDTPCI is not set | ||
878 | |||
879 | # | ||
880 | # USB-based Watchdog Cards | ||
881 | # | ||
882 | # CONFIG_USBPCWATCHDOG is not set | ||
883 | CONFIG_HW_RANDOM=y | 847 | CONFIG_HW_RANDOM=y |
884 | CONFIG_HW_RANDOM_INTEL=y | 848 | CONFIG_HW_RANDOM_INTEL=y |
885 | CONFIG_HW_RANDOM_AMD=y | 849 | CONFIG_HW_RANDOM_AMD=y |
@@ -1056,6 +1020,7 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y | |||
1056 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 | 1020 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 |
1057 | CONFIG_VIDEO_SELECT=y | 1021 | CONFIG_VIDEO_SELECT=y |
1058 | CONFIG_DUMMY_CONSOLE=y | 1022 | CONFIG_DUMMY_CONSOLE=y |
1023 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
1059 | 1024 | ||
1060 | # | 1025 | # |
1061 | # Sound | 1026 | # Sound |
@@ -1301,7 +1266,7 @@ CONFIG_INOTIFY=y | |||
1301 | CONFIG_INOTIFY_USER=y | 1266 | CONFIG_INOTIFY_USER=y |
1302 | # CONFIG_QUOTA is not set | 1267 | # CONFIG_QUOTA is not set |
1303 | CONFIG_DNOTIFY=y | 1268 | CONFIG_DNOTIFY=y |
1304 | CONFIG_AUTOFS_FS=y | 1269 | # CONFIG_AUTOFS_FS is not set |
1305 | CONFIG_AUTOFS4_FS=y | 1270 | CONFIG_AUTOFS4_FS=y |
1306 | # CONFIG_FUSE_FS is not set | 1271 | # CONFIG_FUSE_FS is not set |
1307 | 1272 | ||
@@ -1494,4 +1459,5 @@ CONFIG_DEBUG_STACKOVERFLOW=y | |||
1494 | # CONFIG_CRC16 is not set | 1459 | # CONFIG_CRC16 is not set |
1495 | CONFIG_CRC32=y | 1460 | CONFIG_CRC32=y |
1496 | # CONFIG_LIBCRC32C is not set | 1461 | # CONFIG_LIBCRC32C is not set |
1462 | CONFIG_ZLIB_INFLATE=y | ||
1497 | CONFIG_PLIST=y | 1463 | CONFIG_PLIST=y |