xf86-video-intel: 2 commits - src/i830_batchbuffer.c

[Jesse Barnes]

 src/i830_batchbuffer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1c802e4a0324386cf7370594a46354c89e3b646
Merge: 3733a1b... 808b72f...
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Fri Aug 29 09:23:35 2008 -0700

    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel

commit 3733a1b54c95aa378f32577f9e996946e8e8e48c
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date:   Fri Aug 29 09:12:05 2008 -0700

    Fix build when using kernel DRM headers
    
    Unfortunate mismatch between kernel and DRM master headers.
    Kernel:
    typedef struct _drm_i915_batchbuffer { ... } drm_i915_batchbuffer_t;
    DRM master:
    typedef struct drm_i915_batchbuffer { ... } drm_i915_batchbuffer_t;
    
    so use the typedef rather than the morphing structure name.

diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index 07ea082..75e98e0 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -121,7 +121,7 @@ intel_batch_flush(ScrnInfoPtr pScrn)
 	dri_process_relocs(pI830->batch_bo);
 
 	if (pI830->directRenderingEnabled) {
-	    struct drm_i915_batchbuffer batch;
+	    drm_i915_batchbuffer_t batch;
 	    int ret;
 
 	    batch.start = pI830->batch_bo->offset;