diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 03:53:41 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 03:53:41 +0400 |
| commit | 2467d7b7037438f2d1fed826fc5217dddf4b37fb (patch) | |
| tree | df18dcc4a4cc4c6cad3b79c3079a6791ceaae14a /drivers/acpi/internal.h | |
| parent | 929c6dd4195f6b4daf9887da34b3d7fbd0f2e2f5 (diff) | |
| parent | cf8df962aa830d05be1a8d5a9c7d2a67b2837b45 (diff) | |
| download | linux-2467d7b7037438f2d1fed826fc5217dddf4b37fb.tar.xz | |
Merge branch 'acpi-lpss'
* acpi-lpss:
ACPI / LPSS: make code less confusing for reader
ACPI / LPSS: Add support for exposing LTR registers to user space
ACPI / scan: Add special handler for Intel Lynxpoint LPSS devices
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 7f094adfe05a..6f1afd9118c8 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -59,6 +59,11 @@ int acpi_debugfs_init(void); #else static inline void acpi_debugfs_init(void) { return; } #endif +#ifdef CONFIG_X86_INTEL_LPSS +void acpi_lpss_init(void); +#else +static inline void acpi_lpss_init(void) {} +#endif /* -------------------------------------------------------------------------- Device Node Initialization / Removal @@ -142,4 +147,7 @@ static inline void suspend_nvs_restore(void) {} -------------------------------------------------------------------------- */ struct platform_device; +int acpi_create_platform_device(struct acpi_device *adev, + const struct acpi_device_id *id); + #endif /* _ACPI_INTERNAL_H_ */ |