diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 02:17:26 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 02:17:26 +0300 |
| commit | 4def8a360fc6119e09916708cca0977a1495ccf4 (patch) | |
| tree | a06d2254a0f99f1b0e63455d06e5c6ad47b463f5 /drivers/acpi/internal.h | |
| parent | 763d949581ed1d610c5e09081b36d9beea8e4abc (diff) | |
| parent | e7d024c00a4a7b617390db863bdd5b9dc65821f7 (diff) | |
| download | linux-4def8a360fc6119e09916708cca0977a1495ccf4.tar.xz | |
Merge branch 'acpi-video'
* acpi-video: (38 commits)
ACPI / video: Make acpi_video_unregister_backlight() private
acpi-video-detect: Remove old API
toshiba-acpi: Port to new backlight interface selection API
thinkpad-acpi: Port to new backlight interface selection API
sony-laptop: Port to new backlight interface selection API
samsung-laptop: Port to new backlight interface selection API
msi-wmi: Port to new backlight interface selection API
msi-laptop: Port to new backlight interface selection API
intel-oaktrail: Port to new backlight interface selection API
ideapad-laptop: Port to new backlight interface selection API
fujitsu-laptop: Port to new backlight interface selection API
eeepc-laptop: Port to new backlight interface selection API
dell-wmi: Port to new backlight interface selection API
dell-laptop: Port to new backlight interface selection API
compal-laptop: Port to new backlight interface selection API
asus-wmi: Port to new backlight interface selection API
asus-laptop: Port to new backlight interface selection API
apple-gmux: Port to new backlight interface selection API
acer-wmi: Port to new backlight interface selection API
ACPI / video: Fix acpi_video _register vs _unregister_backlight race
...
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index ae919b509e6c..787c629bc9b4 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -184,13 +184,6 @@ static inline void suspend_nvs_restore(void) {} #endif /*-------------------------------------------------------------------------- - Video - -------------------------------------------------------------------------- */ -#if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) -bool acpi_osi_is_win8(void); -#endif - -/*-------------------------------------------------------------------------- Device properties -------------------------------------------------------------------------- */ #define ACPI_DT_NAMESPACE_HID "PRP0001" |