git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
video
/
sbuslib.c
diff --git
a/drivers/video/sbuslib.c
b/drivers/video/sbuslib.c
index
4deaac0
..
37d764a
100644
(file)
--- a/
drivers/video/sbuslib.c
+++ b/
drivers/video/sbuslib.c
@@
-10,18
+10,19
@@
#include <linux/fb.h>
#include <linux/mm.h>
#include <linux/uaccess.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"
#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));
{
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;
var->xres_virtual = var->xres;
var->yres_virtual = var->yres;
var->bits_per_pixel = bpp;