diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-08-12 03:43:45 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-08-12 03:43:45 -0400 |
| commit | cada23f308e3869ceb5c75f164d249448dfaec07 (patch) | |
| tree | 97c7aebcad0eb2a93a7519251a01f5be9255ee75 /drivers/acpi/internal.h | |
| parent | e769ece3b129698d2b09811a6f6d304e4eaa8c29 (diff) | |
| parent | 6c8c0c4dc0e98ee2191211d66e9f876e95787073 (diff) | |
Merge branch 'kvm-arm64/fixes-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-master
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 3a50a34fe176..5da44e81dd4d 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h | |||
| @@ -164,4 +164,13 @@ struct platform_device; | |||
| 164 | int acpi_create_platform_device(struct acpi_device *adev, | 164 | int acpi_create_platform_device(struct acpi_device *adev, |
| 165 | const struct acpi_device_id *id); | 165 | const struct acpi_device_id *id); |
| 166 | 166 | ||
| 167 | /*-------------------------------------------------------------------------- | ||
| 168 | Video | ||
| 169 | -------------------------------------------------------------------------- */ | ||
| 170 | #if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) | ||
| 171 | bool acpi_video_backlight_quirks(void); | ||
| 172 | #else | ||
| 173 | static inline bool acpi_video_backlight_quirks(void) { return false; } | ||
| 174 | #endif | ||
| 175 | |||
| 167 | #endif /* _ACPI_INTERNAL_H_ */ | 176 | #endif /* _ACPI_INTERNAL_H_ */ |