diff options
| author | Sean Paul | 2016-02-03 09:52:15 -0600 |
|---|---|---|
| committer | Sean Paul | 2016-02-03 09:52:15 -0600 |
| commit | 870942e56aac024da5e0a621275f6561a4ddab1b (patch) | |
| tree | f50e065f5088a40e2a34ae83e2e3ff6ab2e6f625 /tegra/private.h | |
| parent | bd4d0d244019a72be9ca51ac3e8f35201b271f1b (diff) | |
| parent | b38a4b2326c1be5702f5cb73a53c0ed74c12d510 (diff) | |
| download | external-libdrm-870942e56aac024da5e0a621275f6561a4ddab1b.tar.gz external-libdrm-870942e56aac024da5e0a621275f6561a4ddab1b.tar.xz external-libdrm-870942e56aac024da5e0a621275f6561a4ddab1b.zip | |
Merge tag 'tags/libdrm-2.4.66' into master
Tag libdrm-2.4.66 from git://anongit.freedesktop.org/mesa/drm
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Conflicts:
Android.mk
Makefile.am
configure.ac
freedreno/Android.mk
include/drm/drm_mode.h
intel/Android.mk
libkms/Android.mk
nouveau/Android.mk
radeon/Android.mk
tegra/tegra.c
tests/Makefile.am
xf86drmMode.c
xf86drmMode.h
Change-Id: I3186bde7f196d2f3438c4334591ee2a0c1371c96
Diffstat (limited to 'tegra/private.h')
| -rw-r--r-- | tegra/private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tegra/private.h b/tegra/private.h index 1b490d40..571caa56 100644 --- a/tegra/private.h +++ b/tegra/private.h | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <stdbool.h> | 28 | #include <stdbool.h> |
| 29 | #include <stdint.h> | 29 | #include <stdint.h> |
| 30 | 30 | ||
| 31 | #include <libdrm.h> | 31 | #include <libdrm_macros.h> |
| 32 | #include <xf86atomic.h> | 32 | #include <xf86atomic.h> |
| 33 | 33 | ||
| 34 | #include "tegra.h" | 34 | #include "tegra.h" |