diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-06-04 07:47:41 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-06-04 07:47:41 +0200 |
| commit | 885ae1c55ae46ee1064bc7cb99dc45ddd8bd0328 (patch) | |
| tree | da636f922476a4eeb55066588d9857465f7718f3 /include/drm | |
| parent | Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | imx-drm: imx-tve: remove unused variable (diff) | |
| download | linux-885ae1c55ae46ee1064bc7cb99dc45ddd8bd0328.tar.xz linux-885ae1c55ae46ee1064bc7cb99dc45ddd8bd0328.zip | |
Merge tag 'topic/core-stuff-2014-06-02' of git://anongit.freedesktop.org/drm-intel into drm-next
Just flushing out my pile of random drm patches for the merge window,
nothing big. And it all hung around in drm-intel trees for a while (only
just rebased now).
* tag 'topic/core-stuff-2014-06-02' of git://anongit.freedesktop.org/drm-intel:
imx-drm: imx-tve: remove unused variable
drm: Missed clflushopt in drm_clflush_virt_range
drm/plane: Fix a couple of checkpatch warnings
drm/plane: Fix sparse warnings
drm/exynos: Fix double locks at PM resume
drm/ast: Fix double lock at PM resume
drm/dp-helper: Deprecate old i2c-over-dp_aux heleprs
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_plane_helper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_plane_helper.h b/include/drm/drm_plane_helper.h index 09824becee3e..c5e7ab9503c8 100644 --- a/include/drm/drm_plane_helper.h +++ b/include/drm/drm_plane_helper.h @@ -42,7 +42,7 @@ extern int drm_primary_helper_disable(struct drm_plane *plane); extern void drm_primary_helper_destroy(struct drm_plane *plane); extern const struct drm_plane_funcs drm_primary_helper_funcs; extern struct drm_plane *drm_primary_helper_create_plane(struct drm_device *dev, - uint32_t *formats, + const uint32_t *formats, int num_formats); |