Commit eb7b6b32 authored by Len Brown's avatar Len Brown
Browse files

[ACPI] IA64-related ACPI Kconfig fixes 



Build issues were mostly in the ACPI=n case -- don't do that.
Select ACPI from IA64_GENERIC.
Add some missing dependencies on ACPI.

Mark BLACKLIST_YEAR and some laptop-only ACPI drivers
as X86-only.  Let me know when you get an IA64 Laptop.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 76f58584

arch/ia64/Kconfig

+3 −29
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ choice 


config IA64_GENERIC

	bool "generic"

	select ACPI

	select NUMA

	select ACPI_NUMA

	select VIRTUAL_MEM_MAP
@@ -340,6 +341,7 @@ config IA64_PALINFO 


config ACPI_DEALLOCATE_IRQ

	bool

	depends on ACPI

	depends on IOSAPIC && EXPERIMENTAL

	default y
@@ -351,38 +353,10 @@ endmenu 


menu "Power management and ACPI"



config PM

	bool "Power Management support"

	depends on !IA64_HP_SIM

	default y

	help

	  "Power Management" means that parts of your computer are shut

	  off or put into a power conserving "sleep" mode if they are not

	  being used.  There are two competing standards for doing this: APM

	  and ACPI.  If you want to use either one, say Y here and then also

	  to the requisite support below.



	  Power Management is most important for battery powered laptop

	  computers; if you have a laptop, check out the Linux Laptop home

	  page on the WWW at <http://www.linux-on-laptops.com/> and the

	  Battery Powered Linux mini-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



	  Note that, even if you say N here, Linux on the x86 architecture

	  will issue the hlt instruction if nothing is to be done, thereby

	  sending the processor to sleep and saving power.



config ACPI

	bool

	depends on !IA64_HP_SIM

	default y



if !IA64_HP_SIM

source "kernel/power/Kconfig"



source "drivers/acpi/Kconfig"



endif



endmenu



if !IA64_HP_SIM

arch/ia64/configs/bigsur_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -108,11 +108,9 @@ CONFIG_ACPI=y 
# ACPI (Advanced Configuration and Power Interface) Support

#

CONFIG_ACPI_BUTTON=m

CONFIG_ACPI_VIDEO=m

CONFIG_ACPI_FAN=m

CONFIG_ACPI_PROCESSOR=m

CONFIG_ACPI_THERMAL=m

CONFIG_ACPI_BLACKLIST_YEAR=0

# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_POWER=y

CONFIG_ACPI_PCI=y

arch/ia64/configs/sn2_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -131,12 +131,9 @@ CONFIG_ACPI=y 
# ACPI (Advanced Configuration and Power Interface) Support

#

# CONFIG_ACPI_BUTTON is not set

CONFIG_ACPI_VIDEO=m

CONFIG_ACPI_HOTKEY=m

# CONFIG_ACPI_FAN is not set

# CONFIG_ACPI_PROCESSOR is not set

CONFIG_ACPI_NUMA=y

CONFIG_ACPI_BLACKLIST_YEAR=0

# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_POWER=y

CONFIG_ACPI_PCI=y

arch/ia64/configs/tiger_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -129,13 +129,10 @@ CONFIG_ACPI=y 
# ACPI (Advanced Configuration and Power Interface) Support

#

CONFIG_ACPI_BUTTON=m

# CONFIG_ACPI_VIDEO is not set

# CONFIG_ACPI_HOTKEY is not set

CONFIG_ACPI_FAN=m

CONFIG_ACPI_PROCESSOR=m

# CONFIG_ACPI_HOTPLUG_CPU is not set

CONFIG_ACPI_THERMAL=m

CONFIG_ACPI_BLACKLIST_YEAR=0

# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_POWER=y

CONFIG_ACPI_PCI=y

arch/ia64/configs/zx1_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -129,12 +129,9 @@ CONFIG_ACPI=y 
# ACPI (Advanced Configuration and Power Interface) Support

#

CONFIG_ACPI_BUTTON=y

CONFIG_ACPI_VIDEO=m

CONFIG_ACPI_HOTKEY=m

CONFIG_ACPI_FAN=y

CONFIG_ACPI_PROCESSOR=y

CONFIG_ACPI_THERMAL=y

CONFIG_ACPI_BLACKLIST_YEAR=0

# CONFIG_ACPI_DEBUG is not set

CONFIG_ACPI_POWER=y

CONFIG_ACPI_PCI=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE