projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[powerpc.git]
/
drivers
/
acpi
/
Kconfig
diff --git
a/drivers/acpi/Kconfig
b/drivers/acpi/Kconfig
index
3998c9d
..
fe1e812
100644
(file)
--- 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
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
default 0
help
enter a 4-digit year, eg. 2001 to disable ACPI by default