Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 243b66e7 authored by Len Brown's avatar Len Brown
Browse files

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: default avatarLen Brown <len.brown@intel.com>
parent fc955f67

drivers/acpi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/pnp/pnpacpi/Kconfig

+2 −14
Original line number Diff line number Diff line
@@ -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)