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

[pandora-kernel.git] / drivers / spi / mpc512x_psc_spi.c

diff --git a/drivers/spi/mpc512x_psc_spi.c b/drivers/spi/mpc512x_psc_spi.c
index c8d69fc..77d9e7e 100644 (file)
--- a/drivers/spi/mpc512x_psc_spi.c
+++ b/drivers/spi/mpc512x_psc_spi.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/workqueue.h>
 #include <linux/completion.h>
@@ -440,6 +441,7 @@ static int __devinit mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
        master->setup = mpc512x_psc_spi_setup;
        master->transfer = mpc512x_psc_spi_transfer;
        master->cleanup = mpc512x_psc_spi_cleanup;
+       master->dev.of_node = dev->of_node;
 
        tempp = ioremap(regaddr, size);
        if (!tempp) {
@@ -505,7 +507,7 @@ static int __devexit mpc512x_psc_spi_do_remove(struct device *dev)
        return 0;
 }
 
-static int __devinit mpc512x_psc_spi_of_probe(struct of_device *op,
+static int __devinit mpc512x_psc_spi_of_probe(struct platform_device *op,
                                              const struct of_device_id *match)
 {
        const u32 *regaddr_p;
@@ -537,7 +539,7 @@ static int __devinit mpc512x_psc_spi_of_probe(struct of_device *op,
                                irq_of_parse_and_map(op->dev.of_node, 0), id);
 }
 
-static int __devexit mpc512x_psc_spi_of_remove(struct of_device *op)
+static int __devexit mpc512x_psc_spi_of_remove(struct platform_device *op)
 {
        return mpc512x_psc_spi_do_remove(&op->dev);
 }