ACPI: always enable CONFIG_PNPACPI on CONFIG_ACPI kernels

We removed the ACPI motherboard driver which handled
the ACPI=y, PNP=n case, so now we need to enforce that
PNP & PNPACPI are always enabled for ACPI kernels.

Most major distros ship this way this already.

Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2007-02-15 22:34:36 -05:00
parent fc955f670c
commit 243b66e76a
2 changed files with 3 additions and 14 deletions

View File

@ -13,6 +13,7 @@ config ACPI
depends on IA64 || X86 depends on IA64 || X86
depends on PCI depends on PCI
depends on PM depends on PM
select PNP
default y default y
---help--- ---help---
Advanced Configuration and Power Interface (ACPI) support for Advanced Configuration and Power Interface (ACPI) support for

View File

@ -2,17 +2,5 @@
# Plug and Play ACPI configuration # Plug and Play ACPI configuration
# #
config PNPACPI config PNPACPI
bool "Plug and Play ACPI support" bool
depends on PNP && ACPI default (PNP && ACPI)
default y
---help---
Linux uses the PNPACPI to autodetect built-in
mainboard resources (e.g. parallel port resources).
Some features (e.g. real hotplug) are not currently
implemented.
If you would like the kernel to detect and allocate resources to
your mainboard devices (on some systems they are disabled by the
BIOS) say Y here. Also the PNPACPI can help prevent resource
conflicts between mainboard devices and other bus devices.