diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 18:55:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-11 18:55:48 +0200 |
| commit | 854a989546c12683186c84601d4902591dddd8a9 (patch) | |
| tree | 143362c88a48958bdf68396379c4401f6caa82ae /drivers/video/bw2.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | sparc: Fix debugger syscall restart interactions. (diff) | |
| download | linux-854a989546c12683186c84601d4902591dddd8a9.tar.xz linux-854a989546c12683186c84601d4902591dddd8a9.zip | |
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/bw2.c')
| -rw-r--r-- | drivers/video/bw2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index 79f85dc402d6..e721644bad74 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c @@ -17,11 +17,9 @@ #include <linux/init.h> #include <linux/fb.h> #include <linux/mm.h> +#include <linux/of_device.h> #include <asm/io.h> -#include <asm/oplib.h> -#include <asm/prom.h> -#include <asm/of_device.h> #include <asm/fbio.h> #include "sbuslib.h" @@ -299,7 +297,7 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id * par->physbase = op->resource[0].start; par->which_io = op->resource[0].flags & IORESOURCE_BITS; - sbusfb_fill_var(&info->var, dp->node, 1); + sbusfb_fill_var(&info->var, dp, 1); linebytes = of_getintprop_default(dp, "linebytes", info->var.xres); |