diff options
author | Tony Luck <tony.luck@intel.com> | 2008-08-04 18:47:25 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-08-04 18:47:25 -0400 |
commit | bcbd2b65868213c1426654304de3da330cde6b3a (patch) | |
tree | 6b00d54396a99df832da59c515f437639553ac27 /arch/ia64 | |
parent | ee694d6b4106ca09dcf23f839b44efd152a1da82 (diff) |
[IA64] Update generic config
Changes to support a new platform in my lab.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/configs/generic_defconfig | 71 |
1 files changed, 67 insertions, 4 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index 133089be5f2e..9f483976228f 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_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.27-rc1 | 3 | # Linux kernel version: 2.6.27-rc1 |
4 | # Sat Aug 2 13:24:08 2008 | 4 | # Mon Aug 4 15:38:01 2008 |
5 | # | 5 | # |
6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 6 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
7 | 7 | ||
@@ -245,7 +245,8 @@ CONFIG_ACPI_SYSFS_POWER=y | |||
245 | CONFIG_ACPI_PROC_EVENT=y | 245 | CONFIG_ACPI_PROC_EVENT=y |
246 | CONFIG_ACPI_BUTTON=m | 246 | CONFIG_ACPI_BUTTON=m |
247 | CONFIG_ACPI_FAN=m | 247 | CONFIG_ACPI_FAN=m |
248 | # CONFIG_ACPI_DOCK is not set | 248 | CONFIG_ACPI_DOCK=y |
249 | # CONFIG_ACPI_BAY is not set | ||
249 | CONFIG_ACPI_PROCESSOR=m | 250 | CONFIG_ACPI_PROCESSOR=m |
250 | CONFIG_ACPI_HOTPLUG_CPU=y | 251 | CONFIG_ACPI_HOTPLUG_CPU=y |
251 | CONFIG_ACPI_THERMAL=m | 252 | CONFIG_ACPI_THERMAL=m |
@@ -548,6 +549,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 | |||
548 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 | 549 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 |
549 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | 550 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 |
550 | CONFIG_SCSI_SYM53C8XX_MMIO=y | 551 | CONFIG_SCSI_SYM53C8XX_MMIO=y |
552 | # CONFIG_SCSI_IPR is not set | ||
551 | CONFIG_SCSI_QLOGIC_1280=y | 553 | CONFIG_SCSI_QLOGIC_1280=y |
552 | # CONFIG_SCSI_QLA_FC is not set | 554 | # CONFIG_SCSI_QLA_FC is not set |
553 | # CONFIG_SCSI_QLA_ISCSI is not set | 555 | # CONFIG_SCSI_QLA_ISCSI is not set |
@@ -557,7 +559,67 @@ CONFIG_SCSI_QLOGIC_1280=y | |||
557 | # CONFIG_SCSI_DEBUG is not set | 559 | # CONFIG_SCSI_DEBUG is not set |
558 | # CONFIG_SCSI_SRP is not set | 560 | # CONFIG_SCSI_SRP is not set |
559 | # CONFIG_SCSI_DH is not set | 561 | # CONFIG_SCSI_DH is not set |
560 | # CONFIG_ATA is not set | 562 | CONFIG_ATA=y |
563 | CONFIG_ATA_NONSTANDARD=y | ||
564 | CONFIG_ATA_ACPI=y | ||
565 | CONFIG_SATA_PMP=y | ||
566 | # CONFIG_SATA_AHCI is not set | ||
567 | # CONFIG_SATA_SIL24 is not set | ||
568 | CONFIG_ATA_SFF=y | ||
569 | # CONFIG_SATA_SVW is not set | ||
570 | CONFIG_ATA_PIIX=y | ||
571 | # CONFIG_SATA_MV is not set | ||
572 | # CONFIG_SATA_NV is not set | ||
573 | # CONFIG_PDC_ADMA is not set | ||
574 | # CONFIG_SATA_QSTOR is not set | ||
575 | # CONFIG_SATA_PROMISE is not set | ||
576 | # CONFIG_SATA_SX4 is not set | ||
577 | # CONFIG_SATA_SIL is not set | ||
578 | # CONFIG_SATA_SIS is not set | ||
579 | # CONFIG_SATA_ULI is not set | ||
580 | # CONFIG_SATA_VIA is not set | ||
581 | # CONFIG_SATA_VITESSE is not set | ||
582 | # CONFIG_SATA_INIC162X is not set | ||
583 | # CONFIG_PATA_ACPI is not set | ||
584 | # CONFIG_PATA_ALI is not set | ||
585 | # CONFIG_PATA_AMD is not set | ||
586 | # CONFIG_PATA_ARTOP is not set | ||
587 | # CONFIG_PATA_ATIIXP is not set | ||
588 | # CONFIG_PATA_CMD640_PCI is not set | ||
589 | # CONFIG_PATA_CMD64X is not set | ||
590 | # CONFIG_PATA_CS5520 is not set | ||
591 | # CONFIG_PATA_CS5530 is not set | ||
592 | # CONFIG_PATA_CYPRESS is not set | ||
593 | # CONFIG_PATA_EFAR is not set | ||
594 | # CONFIG_ATA_GENERIC is not set | ||
595 | # CONFIG_PATA_HPT366 is not set | ||
596 | # CONFIG_PATA_HPT37X is not set | ||
597 | # CONFIG_PATA_HPT3X2N is not set | ||
598 | # CONFIG_PATA_HPT3X3 is not set | ||
599 | # CONFIG_PATA_IT821X is not set | ||
600 | # CONFIG_PATA_IT8213 is not set | ||
601 | # CONFIG_PATA_JMICRON is not set | ||
602 | # CONFIG_PATA_TRIFLEX is not set | ||
603 | # CONFIG_PATA_MARVELL is not set | ||
604 | # CONFIG_PATA_MPIIX is not set | ||
605 | # CONFIG_PATA_OLDPIIX is not set | ||
606 | # CONFIG_PATA_NETCELL is not set | ||
607 | # CONFIG_PATA_NINJA32 is not set | ||
608 | # CONFIG_PATA_NS87410 is not set | ||
609 | # CONFIG_PATA_NS87415 is not set | ||
610 | # CONFIG_PATA_OPTI is not set | ||
611 | # CONFIG_PATA_OPTIDMA is not set | ||
612 | # CONFIG_PATA_PDC_OLD is not set | ||
613 | # CONFIG_PATA_RADISYS is not set | ||
614 | # CONFIG_PATA_RZ1000 is not set | ||
615 | # CONFIG_PATA_SC1200 is not set | ||
616 | # CONFIG_PATA_SERVERWORKS is not set | ||
617 | # CONFIG_PATA_PDC2027X is not set | ||
618 | # CONFIG_PATA_SIL680 is not set | ||
619 | # CONFIG_PATA_SIS is not set | ||
620 | # CONFIG_PATA_VIA is not set | ||
621 | # CONFIG_PATA_WINBOND is not set | ||
622 | # CONFIG_PATA_SCH is not set | ||
561 | CONFIG_MD=y | 623 | CONFIG_MD=y |
562 | CONFIG_BLK_DEV_MD=m | 624 | CONFIG_BLK_DEV_MD=m |
563 | CONFIG_MD_LINEAR=m | 625 | CONFIG_MD_LINEAR=m |
@@ -668,7 +730,8 @@ CONFIG_E1000=y | |||
668 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 730 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
669 | # CONFIG_E1000E is not set | 731 | # CONFIG_E1000E is not set |
670 | # CONFIG_IP1000 is not set | 732 | # CONFIG_IP1000 is not set |
671 | # CONFIG_IGB is not set | 733 | CONFIG_IGB=y |
734 | # CONFIG_IGB_LRO is not set | ||
672 | # CONFIG_NS83820 is not set | 735 | # CONFIG_NS83820 is not set |
673 | # CONFIG_HAMACHI is not set | 736 | # CONFIG_HAMACHI is not set |
674 | # CONFIG_YELLOWFIN is not set | 737 | # CONFIG_YELLOWFIN is not set |