Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / block / xsysace.c

diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index b71888b909a0e43dea2ad8cf36faffb1de27701b..2982b3ee9465d1521a6296186c52be9c3a8dc462 100644 (file)
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1194,7 +1194,7 @@ static struct platform_driver ace_platform_driver = {
 
 #if defined(CONFIG_OF)
 static int __devinit
-ace_of_probe(struct of_device *op, const struct of_device_id *match)
+ace_of_probe(struct platform_device *op, const struct of_device_id *match)
 {
        struct resource res;
        resource_size_t physaddr;
@@ -1226,7 +1226,7 @@ ace_of_probe(struct of_device *op, const struct of_device_id *match)
        return ace_alloc(&op->dev, id ? *id : 0, physaddr, irq, bus_width);
 }
 
-static int __devexit ace_of_remove(struct of_device *op)
+static int __devexit ace_of_remove(struct platform_device *op)
 {
        ace_free(&op->dev);
        return 0;