usb: musb: Change to direct addr in context save/restore

[deliverable/linux.git] / drivers / video / ffb.c

diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index f6ecfab296d39515f3639c3af2f618aa9a702f63..6739b2af3bc0fad9d4b772aed65538d166ca7588 100644 (file)
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -893,7 +893,7 @@ static void ffb_init_fix(struct fb_info *info)
        info->fix.accel = FB_ACCEL_SUN_CREATOR;
 }
 
-static int __devinit ffb_probe(struct of_device *op,
+static int __devinit ffb_probe(struct platform_device *op,
                               const struct of_device_id *match)
 {
        struct device_node *dp = op->dev.of_node;
@@ -1023,7 +1023,7 @@ out_err:
        return err;
 }
 
-static int __devexit ffb_remove(struct of_device *op)
+static int __devexit ffb_remove(struct platform_device *op)
 {
        struct fb_info *info = dev_get_drvdata(&op->dev);
        struct ffb_par *par = info->par;