mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Pull misc-for-upstream into release branch
Conflicts: drivers/usb/misc/appledisplay.c Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
commit
81450b73dd
19 changed files with 141 additions and 170 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue