3 files changed, 25 insertions, 27 deletions

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index b0eba3ac6420..e380ee8b0247 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -806,8 +806,8 @@ static void __iomem * __init aty128_map_ROM(const struct aty128fb_par *par, stru
 
         /* Very simple test to make sure it appeared */
         if (BIOS_IN16(0) != 0xaa55) {
-                printk(KERN_ERR "aty128fb: Invalid ROM signature %x should be 0xaa55\n",
-                       BIOS_IN16(0));
+                printk(KERN_DEBUG "aty128fb: Invalid ROM signature %x should "
+                        " be 0xaa55\n", BIOS_IN16(0));
                 goto failed;
         }
 
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 3e10bd837d9e..037fe9d32fe3 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -911,20 +911,6 @@ static int aty_var_to_crtc(const struct fb_info *info,
                 vdisplay  = par->lcd_height;
 #endif
 
-        if(vdisplay < 400) {
-                h_sync_pol = 1;
-                v_sync_pol = 0;
-        } else if(vdisplay < 480) {
-                h_sync_pol = 0;
-                v_sync_pol = 1;
-        } else if(vdisplay < 768) {
-                h_sync_pol = 0;
-                v_sync_pol = 0;
-        } else {
-                h_sync_pol = 1;
-                v_sync_pol = 1;
-        }
-
         v_disp--;
         v_sync_strt--;
         v_sync_end--;
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index e7e8b52014c3..046b47860266 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -329,8 +329,9 @@ static int __devinit radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev
 
         /* Very simple test to make sure it appeared */
         if (BIOS_IN16(0) != 0xaa55) {
-                printk(KERN_ERR "radeonfb (%s): Invalid ROM signature %x should be"
-                       "0xaa55\n", pci_name(rinfo->pdev), BIOS_IN16(0));
+                printk(KERN_DEBUG "radeonfb (%s): Invalid ROM signature %x "
+                        "should be 0xaa55\n",
+                        pci_name(rinfo->pdev), BIOS_IN16(0));
                 goto failed;
         }
         /* Look for the PCI data to check the ROM type */
@@ -2312,19 +2313,27 @@ static int radeonfb_pci_register (struct pci_dev *pdev,
         rinfo->mmio_base_phys = pci_resource_start (pdev, 2);
 
         /* request the mem regions */
-        ret = pci_request_regions(pdev, "radeonfb");
+        ret = pci_request_region(pdev, 0, "radeonfb framebuffer");
         if (ret < 0) {
-                printk( KERN_ERR "radeonfb (%s): cannot reserve PCI regions."
-                        "  Someone already got them?\n", pci_name(rinfo->pdev));
+                printk( KERN_ERR "radeonfb (%s): cannot request region 0.\n",
+                        pci_name(rinfo->pdev));
                 goto err_release_fb;
         }
 
+        ret = pci_request_region(pdev, 2, "radeonfb mmio");
+        if (ret < 0) {
+                printk( KERN_ERR "radeonfb (%s): cannot request region 2.\n",
+                        pci_name(rinfo->pdev));
+                goto err_release_pci0;
+        }
+
         /* map the regions */
         rinfo->mmio_base = ioremap(rinfo->mmio_base_phys, RADEON_REGSIZE);
         if (!rinfo->mmio_base) {
-                printk(KERN_ERR "radeonfb (%s): cannot map MMIO\n", pci_name(rinfo->pdev));
+                printk(KERN_ERR "radeonfb (%s): cannot map MMIO\n",
+                       pci_name(rinfo->pdev));
                 ret = -EIO;
-                goto err_release_pci;
+                goto err_release_pci2;
         }
 
         rinfo->fb_local_base = INREG(MC_FB_LOCATION) << 16;
@@ -2499,10 +2508,12 @@ err_unmap_rom:
         if (rinfo->bios_seg)
                 radeon_unmap_ROM(rinfo, pdev);
         iounmap(rinfo->mmio_base);
-err_release_pci:
-        pci_release_regions(pdev);
+err_release_pci2:
+        pci_release_region(pdev, 2);
+err_release_pci0:
+        pci_release_region(pdev, 0);
 err_release_fb:
-        framebuffer_release(info);
+        framebuffer_release(info);
 err_disable:
         pci_disable_device(pdev);
 err_out:
@@ -2548,7 +2559,8 @@ static void __devexit radeonfb_pci_unregister (struct pci_dev *pdev)
         iounmap(rinfo->mmio_base);
         iounmap(rinfo->fb_base);
  
-        pci_release_regions(pdev);
+        pci_release_region(pdev, 2);
+        pci_release_region(pdev, 0);
 
         kfree(rinfo->mon1_EDID);
         kfree(rinfo->mon2_EDID);