aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu, Shuo <shuo.liu@intel.com>2011-01-31 12:31:34 +0800
committerPatrick Tjin <pattjin@google.com>2014-07-21 22:01:45 -0700
commit8ef3e48823dd4e458705a79dade6d1c0c1a00c72 (patch)
tree7fc9cc876db705c38ab46218ebe2bda5917ee166
parent27b7c42e94ba5300f1b0830f929454049d2aff67 (diff)
downloadlibwsbm-8ef3e48823dd4e458705a79dade6d1c0c1a00c72.tar.gz
Enable video playback in libwsbm
Change-Id: I60d2578091ce74294c8b10757e3f43feaf5648b4 Signed-off-by: Liu, Shuo <shuo.liu@intel.com>
-rw-r--r--src/Android.mk2
-rw-r--r--src/wsbm_fencemgr.c2
-rw-r--r--src/wsbm_slabpool.c2
-rw-r--r--src/wsbm_ttmpool.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/Android.mk b/src/Android.mk
index 26f7359..237ead9 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -31,8 +31,8 @@ LOCAL_COPY_HEADERS := \
wsbm_priv.h \
wsbm_util.h
-LOCAL_MODULE:= libwsbm
LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE:= libwsbm
LOCAL_SHARED_LIBRARIES:= libdrm
diff --git a/src/wsbm_fencemgr.c b/src/wsbm_fencemgr.c
index 0e7a302..4010ac9 100644
--- a/src/wsbm_fencemgr.c
+++ b/src/wsbm_fencemgr.c
@@ -38,7 +38,7 @@
#include "wsbm_pool.h"
#include "wsbm_manager.h"
#include <xf86drm.h>
-#include <ttm/ttm_fence_user.h>
+#include <psb_ttm_fence_user.h>
#include <string.h>
#include <unistd.h>
diff --git a/src/wsbm_slabpool.c b/src/wsbm_slabpool.c
index 51a85d0..56f7d65 100644
--- a/src/wsbm_slabpool.c
+++ b/src/wsbm_slabpool.c
@@ -34,7 +34,7 @@
#include "config.h"
#endif
-#include <ttm/ttm_placement_user.h>
+#include <psb_ttm_placement_user.h>
#include <stdint.h>
#include <sys/time.h>
#include <errno.h>
diff --git a/src/wsbm_ttmpool.c b/src/wsbm_ttmpool.c
index c03c56e..5847a2f 100644
--- a/src/wsbm_ttmpool.c
+++ b/src/wsbm_ttmpool.c
@@ -42,7 +42,7 @@
#include "assert.h"
#include "wsbm_priv.h"
#include "wsbm_manager.h"
-#include "ttm/ttm_placement_user.h"
+#include "psb_ttm_placement_user.h"
#define DRMRESTARTCOMMANDWRITE(_fd, _val, _arg, _ret) \
do { \