[PATCH] Fix Oops & warning on PPC in rivafb

Independently from the other fbdev updates I'm cooking (some of them
will be in your mailbox rsn), this fixes an error in parameter passing
to a function in rivafb (only used on ppc) that could cause an oops and
definitely causes a warning at compile time.

diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 172664f06df5b9bdca22db070621d2f76787b350..39237a02888475ad35b4827bb280dec325c82908 100644 (file)
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1615,8 +1615,9 @@ static int __devinit riva_set_fbinfo(struct fb_info *info)
 }
 
 #ifdef CONFIG_PPC_OF
-static int riva_get_EDID_OF(struct riva_par *par, struct pci_dev *pd)
+static int riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
 {
+       struct riva_par *par = (struct riva_par *) info->par;
        struct device_node *dp;
        unsigned char *pedid = NULL;