mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'ull' into test
Conflicts: drivers/acpi/bay.c drivers/acpi/dock.c drivers/ata/libata-acpi.c Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
commit
7674416db4
30 changed files with 123 additions and 110 deletions
|
|
@ -46,7 +46,7 @@ acpi_extract_package(union acpi_object *package,
|
|||
acpi_status
|
||||
acpi_evaluate_integer(acpi_handle handle,
|
||||
acpi_string pathname,
|
||||
struct acpi_object_list *arguments, unsigned long *data);
|
||||
struct acpi_object_list *arguments, unsigned long long *data);
|
||||
acpi_status
|
||||
acpi_evaluate_reference(acpi_handle handle,
|
||||
acpi_string pathname,
|
||||
|
|
|
|||
Loading…
Reference in a new issue