aboutsummaryrefslogtreecommitdiff
path: root/drivers/pnp/pnpacpi/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-15 22:34:36 -0500
committerLen Brown <len.brown@intel.com>2007-02-15 22:38:04 -0500
commit243b66e76ab722cdec1921d7f80c0cb808131c37 (patch)
tree4349ce788f31277b9c6d8e916cfc4233256b5dc3 /drivers/pnp/pnpacpi/Kconfig
parentfc955f670c0a66aca965605dae797e747b2bef7d (diff)
downloadlinux-linaro-stable-243b66e76ab722cdec1921d7f80c0cb808131c37.tar.gz
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>
Diffstat (limited to 'drivers/pnp/pnpacpi/Kconfig')
-rw-r--r--drivers/pnp/pnpacpi/Kconfig16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/pnp/pnpacpi/Kconfig b/drivers/pnp/pnpacpi/Kconfig
index ad27e5e0101f..b04767ce273e 100644
--- a/drivers/pnp/pnpacpi/Kconfig
+++ b/drivers/pnp/pnpacpi/Kconfig
@@ -2,17 +2,5 @@
# Plug and Play ACPI configuration
#
config PNPACPI
- bool "Plug and Play ACPI support"
- depends on 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.
+ bool
+ default (PNP && ACPI)