diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 12:55:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 12:55:48 -0400 |
commit | 854a989546c12683186c84601d4902591dddd8a9 (patch) | |
tree | 143362c88a48958bdf68396379c4401f6caa82ae /drivers/video/sbuslib.c | |
parent | 633331f389c2d9c631371d09a54626a5e4749452 (diff) | |
parent | 28e6103665301ce60634e8a77f0b657c6cc099de (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Fix debugger syscall restart interactions.
sparc: Fix ptrace() detach.
sparc32: Don't twiddle PT_DTRACE in exec.
sparc video: remove open boot prom code
Diffstat (limited to 'drivers/video/sbuslib.c')
-rw-r--r-- | drivers/video/sbuslib.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c index 4deaac05b938..37d764ad56b0 100644 --- a/drivers/video/sbuslib.c +++ b/drivers/video/sbuslib.c | |||
@@ -10,18 +10,19 @@ | |||
10 | #include <linux/fb.h> | 10 | #include <linux/fb.h> |
11 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
12 | #include <linux/uaccess.h> | 12 | #include <linux/uaccess.h> |
13 | #include <linux/of_device.h> | ||
13 | 14 | ||
14 | #include <asm/oplib.h> | ||
15 | #include <asm/fbio.h> | 15 | #include <asm/fbio.h> |
16 | 16 | ||
17 | #include "sbuslib.h" | 17 | #include "sbuslib.h" |
18 | 18 | ||
19 | void sbusfb_fill_var(struct fb_var_screeninfo *var, int prom_node, int bpp) | 19 | void sbusfb_fill_var(struct fb_var_screeninfo *var, struct device_node *dp, |
20 | int bpp) | ||
20 | { | 21 | { |
21 | memset(var, 0, sizeof(*var)); | 22 | memset(var, 0, sizeof(*var)); |
22 | 23 | ||
23 | var->xres = prom_getintdefault(prom_node, "width", 1152); | 24 | var->xres = of_getintprop_default(dp, "width", 1152); |
24 | var->yres = prom_getintdefault(prom_node, "height", 900); | 25 | var->yres = of_getintprop_default(dp, "height", 900); |
25 | var->xres_virtual = var->xres; | 26 | var->xres_virtual = var->xres; |
26 | var->yres_virtual = var->yres; | 27 | var->yres_virtual = var->yres; |
27 | var->bits_per_pixel = bpp; | 28 | var->bits_per_pixel = bpp; |