diff options
| author | Al Viro <[email protected]> | 2007-10-16 23:27:18 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2007-10-16 23:55:21 +0000 |
| commit | d91f5bb69adde86173071cf7fffbdf705ae8c6e7 (patch) | |
| tree | c986eea64d4432076dcae5bbddb0ccfc9b97deeb | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| download | kernel-d91f5bb69adde86173071cf7fffbdf705ae8c6e7.tar.gz kernel-d91f5bb69adde86173071cf7fffbdf705ae8c6e7.zip | |
fix cirrusfb breakage
Signed-off-by: Al Viro <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
| -rw-r--r-- | 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 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) #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); |