summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@linux.org.tw>2015-07-27 00:00:12 +0800
committerChih-Wei Huang <cwhuang@linux.org.tw>2015-07-27 00:00:12 +0800
commit08c548cf395e0344075de70f3d0a29b87dd60c10 (patch)
tree0c736ffb1e1084ad79bc84b1055dfa238f9f5ccb
parent4c7eccbfd13f1e8c71f7d3c417d2ffe4d853f30b (diff)
parentf0b0d0ab51f4d6dd0275bb6bde5bc14e3419b2d3 (diff)
downloadexternal_drm_gralloc-08c548cf395e0344075de70f3d0a29b87dd60c10.zip
external_drm_gralloc-08c548cf395e0344075de70f3d0a29b87dd60c10.tar.gz
external_drm_gralloc-08c548cf395e0344075de70f3d0a29b87dd60c10.tar.bz2
Merge remote-tracking branch 'x86/kitkat-x86' into lollipop-x86
-rw-r--r--gralloc_drm_pipe.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/gralloc_drm_pipe.c b/gralloc_drm_pipe.c
index 64b1e56..e152171 100644
--- a/gralloc_drm_pipe.c
+++ b/gralloc_drm_pipe.c
@@ -378,11 +378,9 @@ static void pipe_destroy(struct gralloc_drm_drv_t *drv)
#include "radeon/drm/radeon_drm_public.h"
#include "r300/r300_public.h"
/* for r600 */
-#include "radeon/drm/radeon_winsys.h"
#include "r600/r600_public.h"
/* for vmwgfx */
#include "svga/drm/svga_drm_public.h"
-#include "svga/svga_winsys.h"
#include "svga/svga_public.h"
/* for debug */
#include "target-helpers/inline_debug_helper.h"