From d91f5bb69adde86173071cf7fffbdf705ae8c6e7 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 17 Oct 2007 00:27:18 +0100 Subject: [PATCH] fix cirrusfb breakage Signed-off-by: Al Viro Signed-off-by: Linus Torvalds --- drivers/video/cirrusfb.c | 5 +++-- 1 file 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); -- 2.7.4