[patch] to fix i830_driver.c compile error

[Jeff Chua]

i830_driver.c: In function `I830BIOSPreInit':
i830_driver.c:2764: `p' undeclared (first use in this function)
i830_driver.c:2764: (Each undeclared identifier is reported only once
i830_driver.c:2764: for each function it appears in.)
make[6]: *** [i830_driver.o] Error 1
make[6]: Leaving directory 
`/v6/src2/xfree86/xc/programs/Xserver/hw/xfree86/drivers/i810'
make[5]: *** [all] Error 2
make[5]: Leaving directory 
`/v6/src2/xfree86/xc/programs/Xserver/hw/xfree86/drivers'
make[4]: *** [all] Error 2

Thanks,
Jeff
-------------
--- ./xfree86/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c.org     
Tue Apr  5 09:36:35 2005
+++ ./xfree86/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c Tue Apr 
 5 09:37:01 2005
@@ -1656,6 +1656,7 @@
    const char *chipname;
    unsigned int ver;
    char v[5];
+   DisplayModePtr pMode;
    if (pScrn->numEntities != 1)
       return FALSE;
@@ -2761,9 +2762,9 @@
    }
    /* Now we check the VESA BIOS's displayWidth and reset if necessary */
-   p = pScrn->modes;
+   pMode = pScrn->modes;
    do {
-      VbeModeInfoData *data = (VbeModeInfoData *) p->Private;
+      VbeModeInfoData *data = (VbeModeInfoData *) pMode->Private;
       VbeModeInfoBlock *modeInfo;
       /* Get BytesPerScanline so we can reset displayWidth */
@@ -2773,8 +2774,8 @@
 	    pScrn->displayWidth = modeInfo->BytesPerScanline / pI830->cpp;
 	 }
       } 
-      p = p->next;
-   } while (p != NULL && p != pScrn->modes);
+      pMode = pMode->next;
+   } while (pMode != NULL && pMode != pScrn->modes);

    pScrn->currentMode = pScrn->modes;
_______________________________________________
Devel mailing list
Devel@XFree86.Org
http://XFree86.Org/mailman/listinfo/devel