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/i830_hwmc.c | |
| 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/i830_hwmc.c')
| -rw-r--r-- | src/i830_hwmc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/i830_hwmc.c b/src/i830_hwmc.c index 787d93da..cd69a58f 100644 --- a/src/i830_hwmc.c +++ b/src/i830_hwmc.c @@ -58,10 +58,8 @@ Bool intel_xvmc_probe(ScrnInfoPtr pScrn) if (IS_I9XX(pI830)) { if (IS_I915(pI830)) ret = intel_xvmc_set_driver(&i915_xvmc_driver); - /* else ret = intel_xvmc_set_driver(&i965_xvmc_driver); - */ } else { ErrorF("Your chipset doesn't support XvMC.\n"); return FALSE; |