aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/defconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-25 12:45:49 -0400
committerLen Brown <len.brown@intel.com>2005-08-25 12:45:49 -0400
commit09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0 (patch)
tree29e6a11bffc92f6b8393344cab209e1f2b8bf7a9 /arch/x86_64/defconfig
parentd0d59b98d7a0b3801ce03e695ba885b698a6d122 (diff)
parent9c2c38a122cc23d6a09b8004d60a33913683eedf (diff)
Merge HEAD from ../from-linus
Diffstat (limited to 'arch/x86_64/defconfig')
-rw-r--r--arch/x86_64/defconfig21
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index b95c6cf26591..bf57e2362bf4 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#
6CONFIG_X86_64=y 6CONFIG_X86_64=y
7CONFIG_64BIT=y 7CONFIG_64BIT=y
@@ -280,10 +280,6 @@ CONFIG_IPV6=y
280# Network testing 280# Network testing
281# 281#
282# CONFIG_NET_PKTGEN is not set 282# CONFIG_NET_PKTGEN is not set
283CONFIG_NETPOLL=y
284# CONFIG_NETPOLL_RX is not set
285# CONFIG_NETPOLL_TRAP is not set
286CONFIG_NET_POLL_CONTROLLER=y
287# CONFIG_HAMRADIO is not set 283# CONFIG_HAMRADIO is not set
288# CONFIG_IRDA is not set 284# CONFIG_IRDA is not set
289# CONFIG_BT is not set 285# CONFIG_BT is not set
@@ -459,6 +455,7 @@ CONFIG_AIC79XX_DEBUG_MASK=0
459# CONFIG_MEGARAID_NEWGEN is not set 455# CONFIG_MEGARAID_NEWGEN is not set
460# CONFIG_MEGARAID_LEGACY is not set 456# CONFIG_MEGARAID_LEGACY is not set
461CONFIG_SCSI_SATA=y 457CONFIG_SCSI_SATA=y
458# CONFIG_SCSI_SATA_AHCI is not set
462# CONFIG_SCSI_SATA_SVW is not set 459# CONFIG_SCSI_SATA_SVW is not set
463CONFIG_SCSI_ATA_PIIX=y 460CONFIG_SCSI_ATA_PIIX=y
464# CONFIG_SCSI_SATA_NV is not set 461# CONFIG_SCSI_SATA_NV is not set
@@ -488,6 +485,7 @@ CONFIG_SCSI_QLA2XXX=y
488# CONFIG_SCSI_QLA2300 is not set 485# CONFIG_SCSI_QLA2300 is not set
489# CONFIG_SCSI_QLA2322 is not set 486# CONFIG_SCSI_QLA2322 is not set
490# CONFIG_SCSI_QLA6312 is not set 487# CONFIG_SCSI_QLA6312 is not set
488# CONFIG_SCSI_QLA24XX is not set
491# CONFIG_SCSI_LPFC is not set 489# CONFIG_SCSI_LPFC is not set
492# CONFIG_SCSI_DC395x is not set 490# CONFIG_SCSI_DC395x is not set
493# CONFIG_SCSI_DC390T is not set 491# CONFIG_SCSI_DC390T is not set
@@ -508,9 +506,11 @@ CONFIG_BLK_DEV_DM=y
508# 506#
509# Fusion MPT device support 507# Fusion MPT device support
510# 508#
511# CONFIG_FUSION is not set 509CONFIG_FUSION=y
512# CONFIG_FUSION_SPI is not set 510CONFIG_FUSION_SPI=y
513# CONFIG_FUSION_FC is not set 511# CONFIG_FUSION_FC is not set
512CONFIG_FUSION_MAX_SGE=128
513# CONFIG_FUSION_CTL is not set
514 514
515# 515#
516# IEEE 1394 (FireWire) support 516# IEEE 1394 (FireWire) support
@@ -581,6 +581,7 @@ CONFIG_8139TOO=y
581# CONFIG_ACENIC is not set 581# CONFIG_ACENIC is not set
582# CONFIG_DL2K is not set 582# CONFIG_DL2K is not set
583CONFIG_E1000=y 583CONFIG_E1000=y
584# CONFIG_E1000_NAPI is not set
584# CONFIG_NS83820 is not set 585# CONFIG_NS83820 is not set
585# CONFIG_HAMACHI is not set 586# CONFIG_HAMACHI is not set
586# CONFIG_YELLOWFIN is not set 587# CONFIG_YELLOWFIN is not set
@@ -620,6 +621,10 @@ CONFIG_S2IO=m
620# CONFIG_NET_FC is not set 621# CONFIG_NET_FC is not set
621# CONFIG_SHAPER is not set 622# CONFIG_SHAPER is not set
622CONFIG_NETCONSOLE=y 623CONFIG_NETCONSOLE=y
624CONFIG_NETPOLL=y
625# CONFIG_NETPOLL_RX is not set
626# CONFIG_NETPOLL_TRAP is not set
627CONFIG_NET_POLL_CONTROLLER=y
623 628
624# 629#
625# ISDN subsystem 630# ISDN subsystem