[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: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
76f5858482
commit
eb7b6b3264
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -119,13 +119,11 @@ 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_HOTPLUG_CPU=y
|
||||
CONFIG_ACPI_THERMAL=m
|
||||
CONFIG_ACPI_NUMA=y
|
||||
CONFIG_ACPI_BLACKLIST_YEAR=0
|
||||
# CONFIG_ACPI_DEBUG is not set
|
||||
CONFIG_ACPI_POWER=y
|
||||
CONFIG_ACPI_PCI=y
|
||||
|
|
|
@ -107,6 +107,7 @@ config ACPI_BUTTON
|
|||
|
||||
config ACPI_VIDEO
|
||||
tristate "Video"
|
||||
depends on X86
|
||||
depends on EXPERIMENTAL
|
||||
default m
|
||||
help
|
||||
|
@ -121,7 +122,7 @@ config ACPI_VIDEO
|
|||
config ACPI_HOTKEY
|
||||
tristate "Generic Hotkey"
|
||||
depends on EXPERIMENTAL
|
||||
depends on !IA64_SGI_SN
|
||||
depends on X86
|
||||
default n
|
||||
help
|
||||
Experimental consolidated hotkey driver.
|
||||
|
@ -250,6 +251,7 @@ config ACPI_CUSTOM_DSDT_FILE
|
|||
|
||||
config ACPI_BLACKLIST_YEAR
|
||||
int "Disable ACPI for systems before Jan 1st this year"
|
||||
depends on X86
|
||||
default 0
|
||||
help
|
||||
enter a 4-digit year, eg. 2001 to disable ACPI by default
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
config PM
|
||||
bool "Power Management support"
|
||||
depends on !IA64_HP_SIM
|
||||
---help---
|
||||
"Power Management" means that parts of your computer are shut
|
||||
off or put into a power conserving "sleep" mode if they are not
|
||||
|
|
Loading…
Reference in a new issue