xf86-video-r128: Branch 'master'

[Adam Jackson]

 src/r128_driver.c |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 3de85360ca4bfdece74f8b161305b2d4276b705e
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 14 14:38:52 2010 -0400

    Don't allow the config file to override BIOS location
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/src/r128_driver.c b/src/r128_driver.c
index d6448b6..9d08d77 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -938,14 +938,6 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn)
 				/* BIOS */
     from              = X_PROBED;
     info->BIOSAddr    = info->PciInfo->biosBase & 0xfffe0000;
-    if (dev->BiosBase) {
-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		   "BIOS address override, using 0x%08lx instead of 0x%08lx\n",
-		   dev->BiosBase,
-		   info->BIOSAddr);
-	info->BIOSAddr = dev->BiosBase;
-	from           = X_CONFIG;
-    }
     if (info->BIOSAddr) {
 	xf86DrvMsg(pScrn->scrnIndex, from,
 		   "BIOS at 0x%08lx\n", info->BIOSAddr);