aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
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/acpi
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/acpi')
-rw-r--r--drivers/acpi/Kconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 8cafa4adcf49..5e8f15ffe99d 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -107,6 +107,7 @@ config ACPI_BUTTON
107 107
108config ACPI_VIDEO 108config ACPI_VIDEO
109 tristate "Video" 109 tristate "Video"
110 depends on X86
110 depends on EXPERIMENTAL 111 depends on EXPERIMENTAL
111 default m 112 default m
112 help 113 help
@@ -121,7 +122,7 @@ config ACPI_VIDEO
121config ACPI_HOTKEY 122config ACPI_HOTKEY
122 tristate "Generic Hotkey" 123 tristate "Generic Hotkey"
123 depends on EXPERIMENTAL 124 depends on EXPERIMENTAL
124 depends on !IA64_SGI_SN 125 depends on X86
125 default n 126 default n
126 help 127 help
127 Experimental consolidated hotkey driver. 128 Experimental consolidated hotkey driver.
@@ -250,6 +251,7 @@ config ACPI_CUSTOM_DSDT_FILE
250 251
251config ACPI_BLACKLIST_YEAR 252config ACPI_BLACKLIST_YEAR
252 int "Disable ACPI for systems before Jan 1st this year" 253 int "Disable ACPI for systems before Jan 1st this year"
254 depends on X86
253 default 0 255 default 0
254 help 256 help
255 enter a 4-digit year, eg. 2001 to disable ACPI by default 257 enter a 4-digit year, eg. 2001 to disable ACPI by default