Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1547a012 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Tony Luck
Browse files

[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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent f2b3fdc8

arch/ia64/Kconfig

+9 −9
Original line number Original line Diff line number Diff line
@@ -586,7 +586,7 @@ source "fs/Kconfig.binfmt" 




endmenu

endmenu





menu "Power management and ACPI"

menu "Power management and ACPI options"





source "kernel/power/Kconfig"

source "kernel/power/Kconfig"
@@ -642,6 +642,8 @@ source "net/Kconfig" 




source "drivers/Kconfig"

source "drivers/Kconfig"





source "arch/ia64/hp/sim/Kconfig"



config MSPEC

config MSPEC

	tristate "Memory special operations driver"

	tristate "Memory special operations driver"

	depends on IA64

	depends on IA64
@@ -653,6 +655,12 @@ config MSPEC 




source "fs/Kconfig"

source "fs/Kconfig"





source "arch/ia64/Kconfig.debug"



source "security/Kconfig"



source "crypto/Kconfig"



source "arch/ia64/kvm/Kconfig"

source "arch/ia64/kvm/Kconfig"





source "lib/Kconfig"

source "lib/Kconfig"
@@ -679,11 +687,3 @@ config IRQ_PER_CPU 




config IOMMU_HELPER

config IOMMU_HELPER

	def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
 
	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"