diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-16 19:50:39 +0300 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-16 21:11:53 +0300 |
commit | 7f6f26d7adee150e09d7537acc6d6894c27c0b7a (patch) | |
tree | 8706529cde6e982b9382fc6bf83b3ff470493342 /drivers/gpu/drm/tegra/dc.h | |
parent | 116b1c5a364bcbdc40be64d4f3ec9dbc32e264dd (diff) | |
parent | afa351a15d80993f8ba6ae28652cc23127237e37 (diff) | |
download | linux-7f6f26d7adee150e09d7537acc6d6894c27c0b7a.tar.xz |
Merge drm/drm-next into drm-misc-next
Backmerging drm-next to sync with msm tree. Resolves a conflict
between aperture-helper changes and msm's use of those interfaces.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/tegra/dc.h')
-rw-r--r-- | drivers/gpu/drm/tegra/dc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h index f902794d42cc..0559fa6b1bf7 100644 --- a/drivers/gpu/drm/tegra/dc.h +++ b/drivers/gpu/drm/tegra/dc.h @@ -169,7 +169,7 @@ void tegra_crtc_atomic_post_commit(struct drm_crtc *crtc, /* from rgb.c */ int tegra_dc_rgb_probe(struct tegra_dc *dc); -int tegra_dc_rgb_remove(struct tegra_dc *dc); +void tegra_dc_rgb_remove(struct tegra_dc *dc); int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc); int tegra_dc_rgb_exit(struct tegra_dc *dc); |