Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 22 insertions, 13 deletions

diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 0c9ce88e95e8..77dea015ff69 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -32,10 +32,14 @@
 #include <linux/dma-mapping.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#include <linux/of_address.h>
 #include <linux/io.h>
 #include <linux/xilinxfb.h>
 #include <linux/slab.h>
+
+#ifdef CONFIG_PPC_DCR
 #include <asm/dcr.h>
+#endif
 
 #define DRIVER_NAME             "xilinxfb"
 
@@ -123,10 +127,10 @@ struct xilinxfb_drvdata {
                                                 registers */
         void __iomem    *regs;          /* virt. address of the control
                                                 registers */
-
+#ifdef CONFIG_PPC_DCR
         dcr_host_t      dcr_host;
         unsigned int    dcr_len;
-
+#endif
         void            *fb_virt;       /* virt. address of the frame buffer */
         dma_addr_t      fb_phys;        /* phys. address of the frame buffer */
         int             fb_alloced;     /* Flag, was the fb memory alloced? */
@@ -152,9 +156,10 @@ static void xilinx_fb_out_be32(struct xilinxfb_drvdata *drvdata, u32 offset,
 {
         if (drvdata->flags & PLB_ACCESS_FLAG)
                 out_be32(drvdata->regs + (offset << 2), val);
+#ifdef CONFIG_PPC_DCR
         else
                 dcr_write(drvdata->dcr_host, offset, val);
-
+#endif
 }
 
 static int
@@ -383,8 +388,11 @@ static int xilinxfb_release(struct device *dev)
         if (drvdata->flags & PLB_ACCESS_FLAG) {
                 iounmap(drvdata->regs);
                 release_mem_region(drvdata->regs_phys, 8);
-        } else
+        }
+#ifdef CONFIG_PPC_DCR
+        else
                 dcr_unmap(drvdata->dcr_host, drvdata->dcr_len);
+#endif
 
         kfree(drvdata);
         dev_set_drvdata(dev, NULL);
@@ -396,22 +404,19 @@ static int xilinxfb_release(struct device *dev)
  * OF bus binding
  */
 
-static int __devinit
-xilinxfb_of_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit xilinxfb_of_probe(struct platform_device *op)
 {
         const u32 *prop;
         u32 *p;
         u32 tft_access;
         struct xilinxfb_platform_data pdata;
         struct resource res;
-        int size, rc, start;
+        int size, rc;
         struct xilinxfb_drvdata *drvdata;
 
         /* Copy with the default pdata (not a ptr reference!) */
         pdata = xilinx_fb_default_pdata;
 
-        dev_dbg(&op->dev, "xilinxfb_of_probe(%p, %p)\n", op, match);
-
         /* Allocate the driver data region */
         drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL);
         if (!drvdata) {
@@ -437,7 +442,10 @@ xilinxfb_of_probe(struct platform_device *op, const struct of_device_id *match)
                         dev_err(&op->dev, "invalid address\n");
                         goto err;
                 }
-        } else {
+        }
+#ifdef CONFIG_PPC_DCR
+        else {
+                int start;
                 res.start = 0;
                 start = dcr_resource_start(op->dev.of_node, 0);
                 drvdata->dcr_len = dcr_resource_len(op->dev.of_node, 0);
@@ -447,6 +455,7 @@ xilinxfb_of_probe(struct platform_device *op, const struct of_device_id *match)
                         goto err;
                 }
         }
+#endif
 
         prop = of_get_property(op->dev.of_node, "phys-size", &size);
         if ((prop) && (size >= sizeof(u32)*2)) {
@@ -493,7 +502,7 @@ static struct of_device_id xilinxfb_of_match[] __devinitdata = {
 };
 MODULE_DEVICE_TABLE(of, xilinxfb_of_match);
 
-static struct of_platform_driver xilinxfb_of_driver = {
+static struct platform_driver xilinxfb_of_driver = {
         .probe = xilinxfb_of_probe,
         .remove = __devexit_p(xilinxfb_of_remove),
         .driver = {
@@ -511,13 +520,13 @@ static struct of_platform_driver xilinxfb_of_driver = {
 static int __init
 xilinxfb_init(void)
 {
-        return of_register_platform_driver(&xilinxfb_of_driver);
+        return platform_driver_register(&xilinxfb_of_driver);
 }
 
 static void __exit
 xilinxfb_cleanup(void)
 {
-        of_unregister_platform_driver(&xilinxfb_of_driver);
+        platform_driver_unregister(&xilinxfb_of_driver);
 }
 
 module_init(xilinxfb_init);