diff options
| author | Christian König <[email protected]> | 2011-03-03 00:59:12 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-03 00:59:12 +0100 |
| commit | 0eccb1038a620bc76ba45ac00c293b3e88427510 (patch) | |
| tree | 4bd9209ac6e9b824284d47799b13a99a401c6963 /src/egl/wayland/wayland-egl.c | |
| parent | ed12c29bc45b100b758c9affe2cebe8c8498e25e (diff) | |
| parent | 2e756f3d6f15d61297a3bb4efe6a88c29081a5eb (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/egl/wayland/wayland-egl.c')
| -rw-r--r-- | src/egl/wayland/wayland-egl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/egl/wayland/wayland-egl.c b/src/egl/wayland/wayland-egl.c index 12fbdfa29c1..2c84bec64a5 100644 --- a/src/egl/wayland/wayland-egl.c +++ b/src/egl/wayland/wayland-egl.c @@ -12,10 +12,10 @@ #include <dlfcn.h> #include <wayland-client.h> -#include <xf86drm.h> - #include "wayland-egl.h" #include "wayland-egl-priv.h" +#include "wayland-drm-client-protocol.h" +#include <xf86drm.h> static void drm_handle_device(void *data, struct wl_drm *drm, const char *device) |