diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:39:12 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:39:12 -0700 |
| commit | 373cea9e2c9c6495a80efdae55cf2114f384a75b (patch) | |
| tree | 7a8c31aff389cd60937edf7d311c2d93d42a3c7d /include/linux/acpi.h | |
| parent | ea64087da6e7655f5acac074a70496b50b310a29 (diff) | |
| parent | 8a7eb06341c73248d152a2a12e4f00f472295de7 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-15.08-rt
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index cd80aa80d03e..77af62187e7a 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -402,6 +402,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, #define ACPI_OST_SC_INSERT_NOT_SUPPORTED 0x82 extern void acpi_early_init(void); +extern void acpi_subsystem_init(void); extern int acpi_nvs_register(__u64 start, __u64 size); @@ -436,6 +437,7 @@ static inline const char *acpi_dev_name(struct acpi_device *adev) } static inline void acpi_early_init(void) { } +static inline void acpi_subsystem_init(void) { } static inline int early_acpi_boot_init(void) { |