From 24280edbdf54e9559b26ea27c1b005eea73f51bc Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Fri, 9 Nov 2007 13:53:58 -0800
Subject: [PATCH] Fixup warnings

Remove unused 'ret' variable, move pI830 under #ifdef XF86DRI_MM in
i830_allocate_memory.
---
 src/i830_memory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i830_memory.c b/src/i830_memory.c
index 7b89c40f..7e9fb4f0 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -389,7 +389,6 @@ i830_allocator_init(ScrnInfoPtr pScrn, unsigned long offset, unsigned long size)
 {
     I830Ptr pI830 = I830PTR(pScrn);
     i830_memory *start, *end;
-    int ret;
 #ifdef XF86DRI_MM
     int dri_major, dri_minor, dri_patch;
 #endif
@@ -824,10 +823,11 @@ i830_memory *
 i830_allocate_memory(ScrnInfoPtr pScrn, const char *name,
 		     unsigned long size, unsigned long alignment, int flags)
 {
-    I830Ptr pI830 = I830PTR(pScrn);
     i830_memory *mem;
 
 #ifdef XF86DRI_MM
+    I830Ptr pI830 = I830PTR(pScrn);
+
     if (pI830->memory_manager && !(flags & NEED_PHYSICAL_ADDR) &&
 	!(flags & NEED_LIFETIME_FIXED))
     {