diff options
| author | Jesse Barnes <jbarnes@nietzche.virtuousgeek.org> | 2007-11-09 13:53:58 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@nietzche.virtuousgeek.org> | 2007-11-09 13:53:58 -0800 |
| commit | 24280edbdf54e9559b26ea27c1b005eea73f51bc (patch) | |
| tree | 0616d501dbbb75495d2be55d40d883e0f062fde0 /src/i830_memory.c | |
| parent | 4fe507957bf826d81a71cd63af17c5547d1023a1 (diff) | |
Fixup warnings
Remove unused 'ret' variable, move pI830 under #ifdef XF86DRI_MM in
i830_allocate_memory.
Diffstat (limited to 'src/i830_memory.c')
| -rw-r--r-- | src/i830_memory.c | 4 |
1 files 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)) { |