merge with master
[platform/upstream/libwsbm.git] / packaging / 0001-CDV-include-tweaks.patch
1 From cff48cf178ec93de94b03119bc28b719c75bedbf Mon Sep 17 00:00:00 2001
2 From: Joe Konno <joe.konno@intel.com>
3 Date: Mon, 15 Aug 2011 11:34:58 -0700
4 Subject: [PATCH] CDV include tweaks
5
6 ---
7  src/wsbm_fencemgr.c |    2 +-
8  src/wsbm_slabpool.c |    2 +-
9  src/wsbm_ttmpool.c  |    2 +-
10  3 files changed, 3 insertions(+), 3 deletions(-)
11
12 diff --git a/src/wsbm_fencemgr.c b/src/wsbm_fencemgr.c
13 index 0e7a302..4010ac9 100644
14 --- a/src/wsbm_fencemgr.c
15 +++ b/src/wsbm_fencemgr.c
16 @@ -38,7 +38,7 @@
17  #include "wsbm_pool.h"
18  #include "wsbm_manager.h"
19  #include <xf86drm.h>
20 -#include <ttm/ttm_fence_user.h>
21 +#include <psb_ttm_fence_user.h>
22  #include <string.h>
23  #include <unistd.h>
24  
25 diff --git a/src/wsbm_slabpool.c b/src/wsbm_slabpool.c
26 index 51a85d0..56f7d65 100644
27 --- a/src/wsbm_slabpool.c
28 +++ b/src/wsbm_slabpool.c
29 @@ -34,7 +34,7 @@
30  #include "config.h"
31  #endif
32  
33 -#include <ttm/ttm_placement_user.h>
34 +#include <psb_ttm_placement_user.h>
35  #include <stdint.h>
36  #include <sys/time.h>
37  #include <errno.h>
38 diff --git a/src/wsbm_ttmpool.c b/src/wsbm_ttmpool.c
39 index 5867428..93da32a 100644
40 --- a/src/wsbm_ttmpool.c
41 +++ b/src/wsbm_ttmpool.c
42 @@ -42,7 +42,7 @@
43  #include "assert.h"
44  #include "wsbm_priv.h"
45  #include "wsbm_manager.h"
46 -#include "ttm/ttm_placement_user.h"
47 +#include <psb_ttm_placement_user.h>
48  
49  #define DRMRESTARTCOMMANDWRITE(_fd, _val, _arg, _ret)                  \
50         do {                                                            \
51 -- 
52 1.7.4.4
53