diff options
author | Andi Kleen <ak@suse.de> | 2005-08-24 01:37:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-24 13:22:44 -0400 |
commit | b7561524765a30334bf31c56b523aeb3c1a04c7d (patch) | |
tree | e45d7e074f82778666db9d51d15dd0e66f8efdbb | |
parent | 5477d30e841e0f707fd2daddc8cb6949858476ee (diff) |
[PATCH] x86_64: update defconfig - reenable fusion
I mistakedly disabled fusion support in an earlier update. Fusion
is commonly used on many x86-64 systems, so this was a problem.
This patch fixes that.
Signed-off-by: And Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/x86_64/defconfig | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index 776f3c866b70..b97a61e1c71c 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.13-rc3 | 3 | # Linux kernel version: 2.6.13-rc6-git3 |
4 | # Fri Jul 22 16:47:31 2005 | 4 | # Fri Aug 12 16:40:34 2005 |
5 | # | 5 | # |
6 | CONFIG_X86_64=y | 6 | CONFIG_X86_64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -284,10 +284,6 @@ CONFIG_IPV6=y | |||
284 | # Network testing | 284 | # Network testing |
285 | # | 285 | # |
286 | # CONFIG_NET_PKTGEN is not set | 286 | # CONFIG_NET_PKTGEN is not set |
287 | CONFIG_NETPOLL=y | ||
288 | # CONFIG_NETPOLL_RX is not set | ||
289 | # CONFIG_NETPOLL_TRAP is not set | ||
290 | CONFIG_NET_POLL_CONTROLLER=y | ||
291 | # CONFIG_HAMRADIO is not set | 287 | # CONFIG_HAMRADIO is not set |
292 | # CONFIG_IRDA is not set | 288 | # CONFIG_IRDA is not set |
293 | # CONFIG_BT is not set | 289 | # CONFIG_BT is not set |
@@ -463,6 +459,7 @@ CONFIG_AIC79XX_DEBUG_MASK=0 | |||
463 | # CONFIG_MEGARAID_NEWGEN is not set | 459 | # CONFIG_MEGARAID_NEWGEN is not set |
464 | # CONFIG_MEGARAID_LEGACY is not set | 460 | # CONFIG_MEGARAID_LEGACY is not set |
465 | CONFIG_SCSI_SATA=y | 461 | CONFIG_SCSI_SATA=y |
462 | # CONFIG_SCSI_SATA_AHCI is not set | ||
466 | # CONFIG_SCSI_SATA_SVW is not set | 463 | # CONFIG_SCSI_SATA_SVW is not set |
467 | CONFIG_SCSI_ATA_PIIX=y | 464 | CONFIG_SCSI_ATA_PIIX=y |
468 | # CONFIG_SCSI_SATA_NV is not set | 465 | # CONFIG_SCSI_SATA_NV is not set |
@@ -492,6 +489,7 @@ CONFIG_SCSI_QLA2XXX=y | |||
492 | # CONFIG_SCSI_QLA2300 is not set | 489 | # CONFIG_SCSI_QLA2300 is not set |
493 | # CONFIG_SCSI_QLA2322 is not set | 490 | # CONFIG_SCSI_QLA2322 is not set |
494 | # CONFIG_SCSI_QLA6312 is not set | 491 | # CONFIG_SCSI_QLA6312 is not set |
492 | # CONFIG_SCSI_QLA24XX is not set | ||
495 | # CONFIG_SCSI_LPFC is not set | 493 | # CONFIG_SCSI_LPFC is not set |
496 | # CONFIG_SCSI_DC395x is not set | 494 | # CONFIG_SCSI_DC395x is not set |
497 | # CONFIG_SCSI_DC390T is not set | 495 | # CONFIG_SCSI_DC390T is not set |
@@ -512,9 +510,11 @@ CONFIG_BLK_DEV_DM=y | |||
512 | # | 510 | # |
513 | # Fusion MPT device support | 511 | # Fusion MPT device support |
514 | # | 512 | # |
515 | # CONFIG_FUSION is not set | 513 | CONFIG_FUSION=y |
516 | # CONFIG_FUSION_SPI is not set | 514 | CONFIG_FUSION_SPI=y |
517 | # CONFIG_FUSION_FC is not set | 515 | # CONFIG_FUSION_FC is not set |
516 | CONFIG_FUSION_MAX_SGE=128 | ||
517 | # CONFIG_FUSION_CTL is not set | ||
518 | 518 | ||
519 | # | 519 | # |
520 | # IEEE 1394 (FireWire) support | 520 | # IEEE 1394 (FireWire) support |
@@ -585,6 +585,7 @@ CONFIG_8139TOO=y | |||
585 | # CONFIG_ACENIC is not set | 585 | # CONFIG_ACENIC is not set |
586 | # CONFIG_DL2K is not set | 586 | # CONFIG_DL2K is not set |
587 | CONFIG_E1000=y | 587 | CONFIG_E1000=y |
588 | # CONFIG_E1000_NAPI is not set | ||
588 | # CONFIG_NS83820 is not set | 589 | # CONFIG_NS83820 is not set |
589 | # CONFIG_HAMACHI is not set | 590 | # CONFIG_HAMACHI is not set |
590 | # CONFIG_YELLOWFIN is not set | 591 | # CONFIG_YELLOWFIN is not set |
@@ -624,6 +625,10 @@ CONFIG_S2IO=m | |||
624 | # CONFIG_NET_FC is not set | 625 | # CONFIG_NET_FC is not set |
625 | # CONFIG_SHAPER is not set | 626 | # CONFIG_SHAPER is not set |
626 | CONFIG_NETCONSOLE=y | 627 | CONFIG_NETCONSOLE=y |
628 | CONFIG_NETPOLL=y | ||
629 | # CONFIG_NETPOLL_RX is not set | ||
630 | # CONFIG_NETPOLL_TRAP is not set | ||
631 | CONFIG_NET_POLL_CONTROLLER=y | ||
627 | 632 | ||
628 | # | 633 | # |
629 | # ISDN subsystem | 634 | # ISDN subsystem |