From 4004a6087dd55c201b56beee2683faacaf071116 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Thu, 15 Feb 2007 22:34:36 -0500 Subject: [PATCH] --- yaml --- r: 48674 b: refs/heads/master c: 243b66e76ab722cdec1921d7f80c0cb808131c37 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/Kconfig | 1 + trunk/drivers/pnp/pnpacpi/Kconfig | 16 ++-------------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index db8d5f470b84..35fdf968cee6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc955f670c0a66aca965605dae797e747b2bef7d +refs/heads/master: 243b66e76ab722cdec1921d7f80c0cb808131c37 diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig index 20eacc2c9e0e..2d21fed402b5 100644 --- a/trunk/drivers/acpi/Kconfig +++ b/trunk/drivers/acpi/Kconfig @@ -13,6 +13,7 @@ config ACPI depends on IA64 || X86 depends on PCI depends on PM + select PNP default y ---help--- Advanced Configuration and Power Interface (ACPI) support for diff --git a/trunk/drivers/pnp/pnpacpi/Kconfig b/trunk/drivers/pnp/pnpacpi/Kconfig index ad27e5e0101f..b04767ce273e 100644 --- a/trunk/drivers/pnp/pnpacpi/Kconfig +++ b/trunk/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)