summaryrefslogtreecommitdiff
path: root/drivers/pnp
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-16 18:52:41 -0500
committerLen Brown <len.brown@intel.com>2007-02-16 18:52:41 -0500
commit81450b73dde07f473a4a7208b209b4c8b7251d90 (patch)
tree94e676c74c32f2a74dc306cf863d7e190777f2ab /drivers/pnp
parent8a03d9a498eaf02c8a118752050a5154852c13bf (diff)
parent0539771d7236b425f285652f6f297cc7939c8f9a (diff)
downloadlinux-3.10-81450b73dde07f473a4a7208b209b4c8b7251d90.tar.gz
linux-3.10-81450b73dde07f473a4a7208b209b4c8b7251d90.tar.bz2
linux-3.10-81450b73dde07f473a4a7208b209b4c8b7251d90.zip
Pull misc-for-upstream into release branch
Conflicts: drivers/usb/misc/appledisplay.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp')
-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 ad27e5e0101..b04767ce273 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)