summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-11-11 23:23:02 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-11-11 23:23:02 +0100
commit66f5854c6894dc028fc13345838c6f82bfcfef0c (patch)
tree76ac271549bca0d1199df15e1087dcd0d3c6e911 /include
parentbc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff)
parent1571875beecd5de9657f73931449bda1b1329b6f (diff)
Merge branch 'device-properties'
* device-properties: ACPI / platform: Add support for build-in properties
Diffstat (limited to 'include')
-rw-r--r--include/linux/acpi.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 689a8b9b9c8f..61a3d90f32b3 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -555,7 +555,8 @@ int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
int acpi_device_modalias(struct device *, char *, int);
void acpi_walk_dep_device_list(acpi_handle handle);
-struct platform_device *acpi_create_platform_device(struct acpi_device *);
+struct platform_device *acpi_create_platform_device(struct acpi_device *,
+ struct property_entry *);
#define ACPI_PTR(_ptr) (_ptr)
static inline void acpi_device_set_enumerated(struct acpi_device *adev)