diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-03-19 13:12:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-19 13:12:18 +0000 |
| commit | c9e48084c88cf901ad0d99a889f2628a5622d90b (patch) | |
| tree | e95ef2305fa14e0c6e218a6aba8de8df4a0b5798 /drivers/gpu/drm/sti/sti_tvout.c | |
| parent | regulator: axp20x: Use rdev_get_id at appropriate places (diff) | |
| parent | Linux 5.1-rc1 (diff) | |
| download | linux-dev-c9e48084c88cf901ad0d99a889f2628a5622d90b.tar.xz linux-dev-c9e48084c88cf901ad0d99a889f2628a5622d90b.zip | |
Merge tag 'v5.1-rc1' into regulator-5.2
Linux 5.1-rc1
Diffstat (limited to 'drivers/gpu/drm/sti/sti_tvout.c')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_tvout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c index ea4a3b87fa55..c42f2fa7053c 100644 --- a/drivers/gpu/drm/sti/sti_tvout.c +++ b/drivers/gpu/drm/sti/sti_tvout.c @@ -15,7 +15,7 @@ #include <linux/seq_file.h> #include <drm/drmP.h> -#include <drm/drm_crtc_helper.h> +#include <drm/drm_atomic_helper.h> #include "sti_crtc.h" #include "sti_drv.h" |