diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/Kconfig | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 9f481ba59a4b..6bd91ed7cd03 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -586,7 +586,7 @@ source "fs/Kconfig.binfmt" | |||
586 | 586 | ||
587 | endmenu | 587 | endmenu |
588 | 588 | ||
589 | menu "Power management and ACPI" | 589 | menu "Power management and ACPI options" |
590 | 590 | ||
591 | source "kernel/power/Kconfig" | 591 | source "kernel/power/Kconfig" |
592 | 592 | ||
@@ -642,6 +642,8 @@ source "net/Kconfig" | |||
642 | 642 | ||
643 | source "drivers/Kconfig" | 643 | source "drivers/Kconfig" |
644 | 644 | ||
645 | source "arch/ia64/hp/sim/Kconfig" | ||
646 | |||
645 | config MSPEC | 647 | config MSPEC |
646 | tristate "Memory special operations driver" | 648 | tristate "Memory special operations driver" |
647 | depends on IA64 | 649 | depends on IA64 |
@@ -653,6 +655,12 @@ config MSPEC | |||
653 | 655 | ||
654 | source "fs/Kconfig" | 656 | source "fs/Kconfig" |
655 | 657 | ||
658 | source "arch/ia64/Kconfig.debug" | ||
659 | |||
660 | source "security/Kconfig" | ||
661 | |||
662 | source "crypto/Kconfig" | ||
663 | |||
656 | source "arch/ia64/kvm/Kconfig" | 664 | source "arch/ia64/kvm/Kconfig" |
657 | 665 | ||
658 | source "lib/Kconfig" | 666 | source "lib/Kconfig" |
@@ -679,11 +687,3 @@ config IRQ_PER_CPU | |||
679 | 687 | ||
680 | config IOMMU_HELPER | 688 | config IOMMU_HELPER |
681 | 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) |
682 | |||
683 | source "arch/ia64/hp/sim/Kconfig" | ||
684 | |||
685 | source "arch/ia64/Kconfig.debug" | ||
686 | |||
687 | source "security/Kconfig" | ||
688 | |||
689 | source "crypto/Kconfig" | ||