diff options
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r-- | arch/ia64/Kconfig | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 27eec71429b0..6bd91ed7cd03 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -148,6 +148,7 @@ config IA64_GENERIC | |||
148 | select ACPI_NUMA | 148 | select ACPI_NUMA |
149 | select SWIOTLB | 149 | select SWIOTLB |
150 | select PCI_MSI | 150 | select PCI_MSI |
151 | select DMAR | ||
151 | help | 152 | help |
152 | This selects the system type of your hardware. A "generic" kernel | 153 | This selects the system type of your hardware. A "generic" kernel |
153 | will run on any supported IA-64 system. However, if you configure | 154 | will run on any supported IA-64 system. However, if you configure |
@@ -585,7 +586,7 @@ source "fs/Kconfig.binfmt" | |||
585 | 586 | ||
586 | endmenu | 587 | endmenu |
587 | 588 | ||
588 | menu "Power management and ACPI" | 589 | menu "Power management and ACPI options" |
589 | 590 | ||
590 | source "kernel/power/Kconfig" | 591 | source "kernel/power/Kconfig" |
591 | 592 | ||
@@ -641,6 +642,8 @@ source "net/Kconfig" | |||
641 | 642 | ||
642 | source "drivers/Kconfig" | 643 | source "drivers/Kconfig" |
643 | 644 | ||
645 | source "arch/ia64/hp/sim/Kconfig" | ||
646 | |||
644 | config MSPEC | 647 | config MSPEC |
645 | tristate "Memory special operations driver" | 648 | tristate "Memory special operations driver" |
646 | depends on IA64 | 649 | depends on IA64 |
@@ -652,6 +655,12 @@ config MSPEC | |||
652 | 655 | ||
653 | source "fs/Kconfig" | 656 | source "fs/Kconfig" |
654 | 657 | ||
658 | source "arch/ia64/Kconfig.debug" | ||
659 | |||
660 | source "security/Kconfig" | ||
661 | |||
662 | source "crypto/Kconfig" | ||
663 | |||
655 | source "arch/ia64/kvm/Kconfig" | 664 | source "arch/ia64/kvm/Kconfig" |
656 | 665 | ||
657 | source "lib/Kconfig" | 666 | source "lib/Kconfig" |
@@ -678,11 +687,3 @@ config IRQ_PER_CPU | |||
678 | 687 | ||
679 | config IOMMU_HELPER | 688 | config IOMMU_HELPER |
680 | def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB) | 689 | def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB) |
681 | |||
682 | source "arch/ia64/hp/sim/Kconfig" | ||
683 | |||
684 | source "arch/ia64/Kconfig.debug" | ||
685 | |||
686 | source "security/Kconfig" | ||
687 | |||
688 | source "crypto/Kconfig" | ||