aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/cirrusfb.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-16 19:27:18 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 19:55:21 -0400
commitd91f5bb69adde86173071cf7fffbdf705ae8c6e7 (patch)
treec986eea64d4432076dcae5bbddb0ccfc9b97deeb /drivers/video/cirrusfb.c
parentb883a688ce4ba60ba4295ef9bf9854647f4d106e (diff)
fix cirrusfb breakage
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/cirrusfb.c')
-rw-r--r--drivers/video/cirrusfb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index ce22bf5de350..f99cb77e7b42 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -2225,8 +2225,9 @@ static void cirrusfb_pci_unmap(struct fb_info *info)
2225#endif /* CONFIG_PCI */ 2225#endif /* CONFIG_PCI */
2226 2226
2227#ifdef CONFIG_ZORRO 2227#ifdef CONFIG_ZORRO
2228static void __devexit cirrusfb_zorro_unmap(struct cirrusfb_info *cinfo) 2228static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)
2229{ 2229{
2230 struct cirrusfb_info *cinfo = info->par;
2230 zorro_release_device(cinfo->zdev); 2231 zorro_release_device(cinfo->zdev);
2231 2232
2232 if (cinfo->btype == BT_PICASSO4) { 2233 if (cinfo->btype == BT_PICASSO4) {
@@ -2573,7 +2574,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
2573 printk(KERN_INFO "Cirrus Logic chipset on Zorro bus\n"); 2574 printk(KERN_INFO "Cirrus Logic chipset on Zorro bus\n");
2574 zorro_set_drvdata(z, info); 2575 zorro_set_drvdata(z, info);
2575 2576
2576 ret = cirrusfb_register(cinfo); 2577 ret = cirrusfb_register(info);
2577 if (ret) { 2578 if (ret) {
2578 if (btype == BT_PICASSO4) { 2579 if (btype == BT_PICASSO4) {
2579 iounmap(info->screen_base); 2580 iounmap(info->screen_base);