diff options
author | <jgarzik@pretzel.yyz.us> | 2005-05-27 20:09:40 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 20:09:40 -0400 |
commit | 07b08a16186bd083ba06c37c621ea91fc580eb97 (patch) | |
tree | 7374b11612cacdccb51cd386c6e40beaee8a692c /drivers/acpi/Kconfig | |
parent | 462cee296476278acaa54c41925b3273e0e4dd40 (diff) | |
parent | 254feb882a7c6e4e51416dff6a97d847fbbba551 (diff) | |
download | op-kernel-dev-07b08a16186bd083ba06c37c621ea91fc580eb97.zip op-kernel-dev-07b08a16186bd083ba06c37c621ea91fc580eb97.tar.gz |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 0400a52..670fdb5 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -40,13 +40,12 @@ config ACPI available at: <http://www.acpi.info> +if ACPI + config ACPI_BOOT bool - depends on ACPI || X86_HT default y -if ACPI - config ACPI_INTERPRETER bool depends on !IA64_SGI_SN |