projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
acpi.h
diff --git
a/include/linux/acpi.h
b/include/linux/acpi.h
index b729eb3f113745717b831574e8d839b58af6af01..05483393999534d91425b01c4573a5a4aa494fbc 100644
(file)
--- a/
include/linux/acpi.h
+++ b/
include/linux/acpi.h
@@
-514,6
+514,11
@@
static inline bool has_acpi_companion(struct device *dev)
return false;
}
+static inline void acpi_preset_companion(struct device *dev,
+ struct acpi_device *parent, u64 addr)
+{
+}
+
static inline const char *acpi_dev_name(struct acpi_device *adev)
{
return NULL;