Merge branch 'for-3.4/fixes-for-rc1-and-v3.3' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / video / sbuslib.c

diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c
index 963a454b70741ecb696802c98bd5e73dd83e146d..3c1de981a18cf77a49fbe2b9239112e29ecfe547 100644 (file)
--- a/drivers/video/sbuslib.c
+++ b/drivers/video/sbuslib.c
@@ -9,18 +9,20 @@
 #include <linux/string.h>
 #include <linux/fb.h>
 #include <linux/mm.h>
+#include <linux/uaccess.h>
+#include <linux/of_device.h>
 
-#include <asm/oplib.h>
 #include <asm/fbio.h>
 
 #include "sbuslib.h"
 
-void sbusfb_fill_var(struct fb_var_screeninfo *var, int prom_node, int bpp)
+void sbusfb_fill_var(struct fb_var_screeninfo *var, struct device_node *dp,
+                    int bpp)
 {
        memset(var, 0, sizeof(*var));
 
-       var->xres = prom_getintdefault(prom_node, "width", 1152);
-       var->yres = prom_getintdefault(prom_node, "height", 900);
+       var->xres = of_getintprop_default(dp, "width", 1152);
+       var->yres = of_getintprop_default(dp, "height", 900);
        var->xres_virtual = var->xres;
        var->yres_virtual = var->yres;
        var->bits_per_pixel = bpp;
@@ -74,7 +76,7 @@ int sbusfb_mmap_helper(struct sbus_mmap_map *map,
                                map_offset = (physbase + map[i].poff) & POFF_MASK;
                                break;
                        }
-               if (!map_size){
+               if (!map_size) {
                        page += PAGE_SIZE;
                        continue;
                }