Merge remote-tracking branch 'i2c/i2c/for-next'

[karo-tx-linux.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d863e12bbead6eb6161ffce64b791e73dca7fd27..55af199f8aaf73fef834d242442c5cffc6a089c9 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -480,6 +480,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;