Merge branches 'acpica', 'acpi-video' and 'device-properties'
* 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:
commit
3e5050e60e
3 changed files with 5 additions and 5 deletions
|
@ -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,
|
||||
const char *name, const char *cells_name,
|
||||
size_t index, struct acpi_reference_args *args)
|
||||
const char *name, size_t index,
|
||||
struct acpi_reference_args *args)
|
||||
{
|
||||
return -ENXIO;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue