Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[cascardo/linux.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index cc63aef..db7c8bd 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -578,6 +578,11 @@ int acpi_reconfig_notifier_unregister(struct notifier_block *nb);
 
 struct fwnode_handle;
 
+static inline bool acpi_dev_found(const char *hid)
+{
+       return false;
+}
+
 static inline bool is_acpi_node(struct fwnode_handle *fwnode)
 {
        return false;
@@ -688,6 +693,14 @@ static inline bool acpi_driver_match_device(struct device *dev,
        return false;
 }
 
+static inline union acpi_object *acpi_evaluate_dsm(acpi_handle handle,
+                                                  const u8 *uuid,
+                                                  int rev, int func,
+                                                  union acpi_object *argv4)
+{
+       return NULL;
+}
+
 static inline int acpi_device_uevent_modalias(struct device *dev,
                                struct kobj_uevent_env *env)
 {