summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorviro@ZenIV.linux.org.uk2005-09-09 19:31:38 +0200
committerLinus Torvalds2005-09-09 19:45:35 +0200
commit5dce225bd9ea60e28e17076de63df0dee51b2883 (patch)
treeef5388eee2851f08876ff33b0f5b104e25f2d8ee /drivers/acpi/Kconfig
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6 (diff)
downloadkernel-qcow2-linux-5dce225bd9ea60e28e17076de63df0dee51b2883.tar.gz
kernel-qcow2-linux-5dce225bd9ea60e28e17076de63df0dee51b2883.tar.xz
kernel-qcow2-linux-5dce225bd9ea60e28e17076de63df0dee51b2883.zip
[PATCH] Fix CONFIG_ACPI_BLACKLIST_YEAR
This makes ACPI_BLACKLIST_YEAR be consistently defined when ACPI is enabled, regardless of whether we're on x86 or not, and thus avoids bogus -Wundef warnings on ia64. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 3998c9d35fe1..fe1e8126fbae 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -250,8 +250,7 @@ config ACPI_CUSTOM_DSDT_FILE
Enter the full path name to the file wich includes the AmlCode declaration.
config ACPI_BLACKLIST_YEAR
- int "Disable ACPI for systems before Jan 1st this year"
- depends on X86
+ int "Disable ACPI for systems before Jan 1st this year" if X86
default 0
help
enter a 4-digit year, eg. 2001 to disable ACPI by default