summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-25 12:08:25 -0400
committerLen Brown <len.brown@intel.com>2005-08-25 12:14:20 -0400
commiteb7b6b32644f7a48357e02f8004f88b3220f3494 (patch)
treefff8771a500c1a28cb29490aa9722f061e16c1eb /drivers
parent76f58584824c61eb5b3bdbf019236815921d2e7c (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 8cafa4adcf4..5e8f15ffe99 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -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