X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fvideo%2Fcg14.c;h=b17e746717795615dc71a710abb801e9920eef7b;hb=7ca796f492a11f9408e661c8f22cd8c4f486b8e5;hp=0db0fecba93b6718af12b5af3b053333c6783496;hpb=cfd299dffe6f47c04c47b95893708cdc65876fbd;p=linux-2.6

diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index 0db0fecba9..b17e746717 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -17,10 +17,9 @@
 #include <linux/fb.h>
 #include <linux/mm.h>
 #include <linux/uaccess.h>
+#include <linux/of_device.h>
 
 #include <asm/io.h>
-#include <asm/prom.h>
-#include <asm/of_device.h>
 #include <asm/fbio.h>
 
 #include "sbuslib.h"
@@ -482,7 +481,7 @@ static int __devinit cg14_probe(struct of_device *op, const struct of_device_id
 
 	spin_lock_init(&par->lock);
 
-	sbusfb_fill_var(&info->var, dp->node, 8);
+	sbusfb_fill_var(&info->var, dp, 8);
 	info->var.red.length = 8;
 	info->var.green.length = 8;
 	info->var.blue.length = 8;