summaryrefslogtreecommitdiffstats
path: root/drivers/video/ffb.c
diff options
context:
space:
mode:
authorRobert Reif <reif@earthlink.net>2008-05-08 21:37:30 -0700
committerDavid S. Miller <davem@davemloft.net>2008-05-08 21:37:30 -0700
commit6cd5a86b56ec8fc8651c043bdb05ea0c662fb704 (patch)
tree30ba1d4946654f55570ebb69a7286d2cb72fd7a2 /drivers/video/ffb.c
parentdc5dc7e6d71ca9fd1ea01a1418150af3b2937489 (diff)
downloadblackbird-op-linux-6cd5a86b56ec8fc8651c043bdb05ea0c662fb704.tar.gz
blackbird-op-linux-6cd5a86b56ec8fc8651c043bdb05ea0c662fb704.zip
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.c5
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 @@
#include <linux/fb.h>
#include <linux/mm.h>
#include <linux/timer.h>
+#include <linux/of_device.h>
#include <asm/io.h>
#include <asm/upa.h>
-#include <asm/prom.h>
-#include <asm/of_device.h>
#include <asm/fbio.h>
#include "sbuslib.h"
@@ -941,7 +940,7 @@ static int __devinit ffb_probe(struct of_device *op,
info->screen_base = (char *) par->physbase + FFB_DFB24_POFF;
info->pseudo_palette = par->pseudo_palette;
- sbusfb_fill_var(&info->var, dp->node, 32);
+ sbusfb_fill_var(&info->var, dp, 32);
par->fbsize = PAGE_ALIGN(info->var.xres * info->var.yres * 4);
ffb_fixup_var_rgb(&info->var);
OpenPOWER on IntegriCloud