diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 18:52:41 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 18:52:41 -0500 |
| commit | 81450b73dde07f473a4a7208b209b4c8b7251d90 (patch) | |
| tree | 94e676c74c32f2a74dc306cf863d7e190777f2ab /drivers/pnp | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
| parent | 0539771d7236b425f285652f6f297cc7939c8f9a (diff) | |
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/Kconfig | 16 |
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) |