[MTD] mtd_blkdevs.c: Fix names when many devices/partitions are created

[linux-2.6] / drivers / video / savage / savagefb_driver.c

diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 03d74e8ee06777f8991591a61bc2812c2843c775..f4633d1891f121070b68ae5c4cb4f53cf0d76ddc 100644 (file)
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -1897,7 +1897,7 @@ static int __devinit savage_init_fb_info (struct fb_info *info,
                info->pixmap.size = 8*1024;
                info->pixmap.scan_align = 4;
                info->pixmap.buf_align = 4;
-               info->pixmap.access_align = 4;
+               info->pixmap.access_align = 32;
 
                fb_alloc_cmap (&info->cmap, NR_PALETTE, 0);
                info->flags |= FBINFO_HWACCEL_COPYAREA |
@@ -2113,7 +2113,7 @@ static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)
        printk(KERN_DEBUG "state: %u\n", state);
 
        acquire_console_sem();
-       fb_set_suspend(info, state);
+       fb_set_suspend(info, pci_choose_state(dev, state));
        savage_disable_mmio(par);
        release_console_sem();