diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-18 23:07:46 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-18 23:07:46 +0200 |
| commit | 0f40314b81b765c26202cde33523e35809adbe9b (patch) | |
| tree | 34cbbf71b39f88edddb8693f0a61427f305b17fa /include/acpi/video.h | |
| parent | 7dc1d36e8ef8f78f9dadf0476081f3c7ff7f79be (diff) | |
| parent | bcb2b0b2bae2de744223c68521cd51c57feb486c (diff) | |
Merge branch 'acpi-bus'
* acpi-bus:
ACPI: Eliminate CONFIG_.*{, _MODULE} #ifdef in favor of IS_ENABLED()
ACPI: int340x_thermal: add missing CONFIG_ prefix
Diffstat (limited to 'include/acpi/video.h')
| -rw-r--r-- | include/acpi/video.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/video.h b/include/acpi/video.h index e840b294c6f5..c62392d9b52a 100644 --- a/include/acpi/video.h +++ b/include/acpi/video.h @@ -24,7 +24,7 @@ enum acpi_backlight_type { acpi_backlight_native, }; -#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE) +#if IS_ENABLED(CONFIG_ACPI_VIDEO) extern int acpi_video_register(void); extern void acpi_video_unregister(void); extern int acpi_video_get_edid(struct acpi_device *device, int type, |