diff options
| author | Zou Nan hai <nanhai.zou@intel.com> | 2008-11-27 10:48:09 +0800 |
|---|---|---|
| committer | Zou Nan hai <nanhai.zou@intel.com> | 2008-11-27 10:48:09 +0800 |
| commit | ec7fd3d1b477928f9bffde1a72d7f3fdea89e629 (patch) | |
| tree | 3fb8388c6795b08c967a41689c658f2bde4398a8 /src/xvmc/intel_xvmc.h | |
| parent | d978cd4b453ea588ed2fc2f2cb4ec26856fe00d4 (diff) | |
| parent | baec75a56d91546443a2e04812face4997bc764b (diff) | |
Merge branch '965-xvmc'
Conflicts:
src/common.h
src/i830_hwmc.c
src/i830_video.c
Diffstat (limited to 'src/xvmc/intel_xvmc.h')
| -rw-r--r-- | src/xvmc/intel_xvmc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/xvmc/intel_xvmc.h b/src/xvmc/intel_xvmc.h index c4dfd770..9ef21217 100644 --- a/src/xvmc/intel_xvmc.h +++ b/src/xvmc/intel_xvmc.h @@ -201,6 +201,7 @@ typedef struct _intel_xvmc_driver { } intel_xvmc_driver_t, *intel_xvmc_driver_ptr; extern struct _intel_xvmc_driver i915_xvmc_mc_driver; +extern struct _intel_xvmc_driver i965_xvmc_mc_driver; extern struct _intel_xvmc_driver *xvmc_driver; #define SET_BLOCKED_SIGSET() do { \ |