leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'acpica', 'acpi-video' and 'device-properties'

Browse Source 
* acpica:
  ACPI: Better describe ACPI_DEBUGGER

* acpi-video:
  MAINTAINERS: ACPI / video: update a file name in drivers/acpi/

* device-properties:
  ACPI / property: fix compile error for acpi_node_get_property_reference() when CONFIG_ACPI=n
This commit is contained in:
Rafael J. Wysocki 2015-12-04 14:01:17 +01:00
commit 3e5050e60e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -318,7 +318,7 @@ M: Zhang Rui <rui.zhang@intel.com>
L: linux-acpi@vger.kernel.org L: linux-acpi@vger.kernel.org
W: https://01.org/linux-acpi W: https://01.org/linux-acpi
S: Supported S: Supported
F: drivers/acpi/video.c F: drivers/acpi/acpi_video.c
ACPI WMI DRIVER ACPI WMI DRIVER
L: platform-driver-x86@vger.kernel.org L: platform-driver-x86@vger.kernel.org

4
drivers/acpi/Kconfig
View File

@ -58,10 +58,10 @@ config ACPI_CCA_REQUIRED
bool bool
config ACPI_DEBUGGER config ACPI_DEBUGGER
bool "In-kernel debugger (EXPERIMENTAL)" bool "AML debugger interface (EXPERIMENTAL)"
select ACPI_DEBUG select ACPI_DEBUG
help help
Enable in-kernel debugging facilities: statistics, internal Enable in-kernel debugging of AML facilities: statistics, internal
object dump, single step control method execution. object dump, single step control method execution.
This is still under development, currently enabling this only This is still under development, currently enabling this only
results in the compilation of the ACPICA debugger files. results in the compilation of the ACPICA debugger files.

4
include/linux/acpi.h
View File

@ -870,8 +870,8 @@ static inline int acpi_dev_get_property(struct acpi_device *adev,
} }
static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode, static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode,
const char *name, const char *cells_name, const char *name, size_t index,
size_t index, struct acpi_reference_args *args) struct acpi_reference_args *args)
{ {
return -ENXIO; return -ENXIO;
} }