Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d91f5bb69adde86173071cf7fffbdf705ae8c6e7
Commit:     d91f5bb69adde86173071cf7fffbdf705ae8c6e7
Parent:     b883a688ce4ba60ba4295ef9bf9854647f4d106e
Author:     Al Viro <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 17 00:27:18 2007 +0100
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 16:55:21 2007 -0700

    fix cirrusfb breakage
    
    Signed-off-by: Al Viro <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/video/cirrusfb.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index ce22bf5..f99cb77 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -2225,8 +2225,9 @@ static void cirrusfb_pci_unmap(struct fb_info *info)
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_ZORRO
-static void __devexit cirrusfb_zorro_unmap(struct cirrusfb_info *cinfo)
+static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)
 {
+       struct cirrusfb_info *cinfo = info->par;
        zorro_release_device(cinfo->zdev);
 
        if (cinfo->btype == BT_PICASSO4) {
@@ -2573,7 +2574,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
        printk(KERN_INFO "Cirrus Logic chipset on Zorro bus\n");
        zorro_set_drvdata(z, info);
 
-       ret = cirrusfb_register(cinfo);
+       ret = cirrusfb_register(info);
        if (ret) {
                if (btype == BT_PICASSO4) {
                        iounmap(info->screen_base);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to