summaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-17 01:59:38 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-17 01:59:38 +0100
commitbc411b8a643825b634916f9ba167546a88a0ac28 (patch)
tree9243b5c8139391e003e31bea845a59975aeced3e /include/linux/acpi.h
parent8341ecc9f4eb7513951bd1986d78185a11ac6d4e (diff)
parentb9f73067f32531db608e469a9ad20ce631e34550 (diff)
downloadop-kernel-dev-bc411b8a643825b634916f9ba167546a88a0ac28.zip
op-kernel-dev-bc411b8a643825b634916f9ba167546a88a0ac28.tar.gz
Merge branch 'acpi-modules'
* acpi-modules: platform: introduce OF style 'modalias' support for platform bus ACPI: fix module autoloading for ACPI enumerated devices ACPI: add module autoloading support for ACPI enumerated devices ACPI: fix create_modalias() return value handling
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 3e3247d..1151a1d 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -416,6 +416,9 @@ static inline bool acpi_driver_match_device(struct device *dev,
return !!acpi_match_device(drv->acpi_match_table, dev);
}
+int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
+int acpi_device_modalias(struct device *, char *, int);
+
#define ACPI_PTR(_ptr) (_ptr)
#else /* !CONFIG_ACPI */
@@ -495,6 +498,18 @@ static inline bool acpi_driver_match_device(struct device *dev,
return false;
}
+static inline int acpi_device_uevent_modalias(struct device *dev,
+ struct kobj_uevent_env *env)
+{
+ return -ENODEV;
+}
+
+static inline int acpi_device_modalias(struct device *dev,
+ char *buf, int size)
+{
+ return -ENODEV;
+}
+
#define ACPI_PTR(_ptr) (NULL)
#endif /* !CONFIG_ACPI */
OpenPOWER on IntegriCloud