diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-11-06 17:53:54 +0100 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-11-06 18:24:43 +0100 |
| commit | 1547a01226bcc3fd575fd5383b8b55476a02b518 (patch) | |
| tree | 93df846fdc5cf5d0265e9d915b6e6cdfb47eccde /arch/ia64/Kconfig | |
| parent | [IA64] Build VT-D iommu support into generic kernel (diff) | |
| download | linux-1547a01226bcc3fd575fd5383b8b55476a02b518.tar.xz linux-1547a01226bcc3fd575fd5383b8b55476a02b518.zip | |
[IA64] reorder Kconfig options to match x86
No functional change, just reorder some config options and update
the "Power management and ACPI" label to match the defacto x86
standard.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/Kconfig')
| -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" endmenu -menu "Power management and ACPI" +menu "Power management and ACPI options" source "kernel/power/Kconfig" @@ -642,6 +642,8 @@ source "net/Kconfig" source "drivers/Kconfig" +source "arch/ia64/hp/sim/Kconfig" + config MSPEC tristate "Memory special operations driver" depends on IA64 @@ -653,6 +655,12 @@ config MSPEC source "fs/Kconfig" +source "arch/ia64/Kconfig.debug" + +source "security/Kconfig" + +source "crypto/Kconfig" + source "arch/ia64/kvm/Kconfig" source "lib/Kconfig" @@ -679,11 +687,3 @@ config IRQ_PER_CPU config IOMMU_HELPER def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB) - -source "arch/ia64/hp/sim/Kconfig" - -source "arch/ia64/Kconfig.debug" - -source "security/Kconfig" - -source "crypto/Kconfig" |