diff options
author | Robert Reif <reif@earthlink.net> | 2008-05-09 00:37:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-09 00:37:30 -0400 |
commit | 6cd5a86b56ec8fc8651c043bdb05ea0c662fb704 (patch) | |
tree | 30ba1d4946654f55570ebb69a7286d2cb72fd7a2 /drivers/video/ffb.c | |
parent | dc5dc7e6d71ca9fd1ea01a1418150af3b2937489 (diff) |
sparc video: remove open boot prom code
Replace remaining open boot prom code with of.
Boot tested on sparc32 and compile tested on sparc64.
Signed-off-by: Robert Reif <reif@earthlink.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/video/ffb.c')
-rw-r--r-- | drivers/video/ffb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index 0f42a696d176..7992b13ee68f 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c | |||
@@ -16,11 +16,10 @@ | |||
16 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
18 | #include <linux/timer.h> | 18 | #include <linux/timer.h> |
19 | #include <linux/of_device.h> | ||
19 | 20 | ||
20 | #include <asm/io.h> | 21 | #include <asm/io.h> |
21 | #include <asm/upa.h> | 22 | #include <asm/upa.h> |
22 | #include <asm/prom.h> | ||
23 | #include <asm/of_device.h> | ||
24 | #include <asm/fbio.h> | 23 | #include <asm/fbio.h> |
25 | 24 | ||
26 | #include "sbuslib.h" | 25 | #include "sbuslib.h" |
@@ -941,7 +940,7 @@ static int __devinit ffb_probe(struct of_device *op, | |||
941 | info->screen_base = (char *) par->physbase + FFB_DFB24_POFF; | 940 | info->screen_base = (char *) par->physbase + FFB_DFB24_POFF; |
942 | info->pseudo_palette = par->pseudo_palette; | 941 | info->pseudo_palette = par->pseudo_palette; |
943 | 942 | ||
944 | sbusfb_fill_var(&info->var, dp->node, 32); | 943 | sbusfb_fill_var(&info->var, dp, 32); |
945 | par->fbsize = PAGE_ALIGN(info->var.xres * info->var.yres * 4); | 944 | par->fbsize = PAGE_ALIGN(info->var.xres * info->var.yres * 4); |
946 | ffb_fixup_var_rgb(&info->var); | 945 | ffb_fixup_var_rgb(&info->var); |
947 | 946 | ||