diff options
| author | Maxime Ripard <mripard@kernel.org> | 2019-10-03 10:59:29 +0300 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2019-10-03 10:59:29 +0300 |
| commit | 77fdaa091d79c87323a9f3912a25f73e02ea2a01 (patch) | |
| tree | 0e47e2d3c4a966277dbaec075f4685187fdae482 /drivers/gpu/drm/armada/armada_trace.h | |
| parent | e2c4ed148cf3ec8669a1d90dc66966028e5fad70 (diff) | |
| parent | 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c (diff) | |
| download | linux-77fdaa091d79c87323a9f3912a25f73e02ea2a01.tar.xz | |
Merge drm/drm-fixes into drm-misc-fixes
We haven't backmerged for a while, let's start the -rc period by pulling
rc1.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_trace.h')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_trace.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/armada/armada_trace.h b/drivers/gpu/drm/armada/armada_trace.h index f03a56bda596..528f20fe3147 100644 --- a/drivers/gpu/drm/armada/armada_trace.h +++ b/drivers/gpu/drm/armada/armada_trace.h @@ -3,7 +3,10 @@ #define ARMADA_TRACE_H #include <linux/tracepoint.h> -#include <drm/drmP.h> + +struct drm_crtc; +struct drm_framebuffer; +struct drm_plane; #undef TRACE_SYSTEM #define TRACE_SYSTEM armada |