Fixup warnings
Remove unused 'ret' variable, move pI830 under #ifdef XF86DRI_MM in i830_allocate_memory.
This commit is contained in:
parent
4fe507957b
commit
24280edbdf
|
|
@ -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))
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue