Home » Mailing list archives » linux-kernel » 2007 » October » 16

[PATCH] fix cirrusfb breakage

Previous thread: [PATCH] i5000_edac: No need to __stringify() KBUILD_BASENAME by Darrick J. Wong on Tuesday, October 16, 2007 - 7:10 pm. (1 message)

Next thread: [PATCH] fix adbhid mismerge by Al Viro on Tuesday, October 16, 2007 - 8:02 pm. (5 messages)
[view original message]
From: Al Viro <viro@...>
To: Linus Torvalds <torvalds@...>
Cc: <linux-kernel@...>, <adaplas@...>
Subject: [PATCH] fix cirrusfb breakage
Date: Tuesday, October 16, 2007 - 7:27 pm

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

---

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);

-
Previous thread: [PATCH] i5000_edac: No need to __stringify() KBUILD_BASENAME by Darrick J. Wong on Tuesday, October 16, 2007 - 7:10 pm. (1 message)

Next thread: [PATCH] fix adbhid mismerge by Al Viro on Tuesday, October 16, 2007 - 8:02 pm. (5 messages)