diff options
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | drivers/acpi/Kconfig | 4 | ||||
-rw-r--r-- | include/linux/acpi.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cba790b42f23..58e290566ae2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -318,7 +318,7 @@ M: Zhang Rui <rui.zhang@intel.com> | |||
318 | L: linux-acpi@vger.kernel.org | 318 | L: linux-acpi@vger.kernel.org |
319 | W: https://01.org/linux-acpi | 319 | W: https://01.org/linux-acpi |
320 | S: Supported | 320 | S: Supported |
321 | F: drivers/acpi/video.c | 321 | F: drivers/acpi/acpi_video.c |
322 | 322 | ||
323 | ACPI WMI DRIVER | 323 | ACPI WMI DRIVER |
324 | L: platform-driver-x86@vger.kernel.org | 324 | L: platform-driver-x86@vger.kernel.org |
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 25dbb76c02cc..5eef4cb4f70e 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -58,10 +58,10 @@ config ACPI_CCA_REQUIRED | |||
58 | bool | 58 | bool |
59 | 59 | ||
60 | config ACPI_DEBUGGER | 60 | config ACPI_DEBUGGER |
61 | bool "In-kernel debugger (EXPERIMENTAL)" | 61 | bool "AML debugger interface (EXPERIMENTAL)" |
62 | select ACPI_DEBUG | 62 | select ACPI_DEBUG |
63 | help | 63 | help |
64 | Enable in-kernel debugging facilities: statistics, internal | 64 | Enable in-kernel debugging of AML facilities: statistics, internal |
65 | object dump, single step control method execution. | 65 | object dump, single step control method execution. |
66 | This is still under development, currently enabling this only | 66 | This is still under development, currently enabling this only |
67 | results in the compilation of the ACPICA debugger files. | 67 | results in the compilation of the ACPICA debugger files. |
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 054833939995..1991aea2ec4c 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -870,8 +870,8 @@ static inline int acpi_dev_get_property(struct acpi_device *adev, | |||
870 | } | 870 | } |
871 | 871 | ||
872 | static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode, | 872 | static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode, |
873 | const char *name, const char *cells_name, | 873 | const char *name, size_t index, |
874 | size_t index, struct acpi_reference_args *args) | 874 | struct acpi_reference_args *args) |
875 | { | 875 | { |
876 | return -ENXIO; | 876 | return -ENXIO; |
877 | } | 877 | } |