xf86-video-ati: Branch 'master'

[Adam Jackson]

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

New commits:
commit 0f37458c253aec46d98db6661c4def711df8fc17
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 14 14:37:34 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/radeon_driver.c b/src/radeon_driver.c
index 6efb172..9e72c2d 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1948,14 +1948,6 @@ static Bool RADEONPreInitChipType(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",
-		   (unsigned long)dev->BiosBase,
-		   (unsigned long)info->BIOSAddr);
-	info->BIOSAddr = dev->BiosBase;
-	from           = X_CONFIG;
-    }
     if (info->BIOSAddr) {
 	xf86DrvMsg(pScrn->scrnIndex, from,
 		   "BIOS at 0x%08lx\n", (unsigned long)info->BIOSAddr);