xf86-video-intel: 2 commits - src/i830_dri.c src/i830_tv.c

[Zhenyu Wang]

 src/i830_dri.c |    3 +--
 src/i830_tv.c  |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 768f317cf0da4cd6682af2e71e71c3e130e05182
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Mon Dec 8 10:33:13 2008 +0800

    Fix DRI2 compiling warning

diff --git a/src/i830_dri.c b/src/i830_dri.c
index daa3ff0..0fe0eca 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1930,7 +1930,7 @@ I830DRI2DestroyBuffers(DrawablePtr pDraw, DRI2BufferPtr buffers, int count)
     }
 }
 
-static unsigned int
+static void
 I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
 		   DRI2BufferPtr pDestBuffer, DRI2BufferPtr pSrcBuffer)
 {
@@ -1966,7 +1966,6 @@ I830DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
 #endif
     drmCommandNone(pI830->drmSubFD, DRM_I915_GEM_THROTTLE);
 
-    return 1;
 }
 
 Bool I830DRI2ScreenInit(ScreenPtr pScreen)
commit 95596f51503bb468364719aec9083d59999e34b7
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Mon Dec 8 10:30:12 2008 +0800

    Fix TV compiling warning

diff --git a/src/i830_tv.c b/src/i830_tv.c
index d507a0c..72d2bd8 100644
--- a/src/i830_tv.c
+++ b/src/i830_tv.c
@@ -1691,7 +1691,7 @@ i830_tv_init(ScrnInfoPtr pScrn)
     I830OutputPrivatePtr    intel_output;
     struct i830_tv_priv	    *dev_priv;
     uint32_t		    tv_dac_on, tv_dac_off, save_tv_dac;
-    char                    *mon_option_lst = NULL;
+    XF86OptionPtr	    mon_option_lst = NULL;
     char		    *tv_format = NULL;
 
     if (pI830->quirk_flag & QUIRK_IGNORE_TV)