diff options
Diffstat (limited to 'drivers/video/cg3.c')
-rw-r--r-- | drivers/video/cg3.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index 010ea53978f8..3aa7b6cb0268 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c | |||
@@ -17,11 +17,9 @@ | |||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/fb.h> | 18 | #include <linux/fb.h> |
19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
20 | #include <linux/of_device.h> | ||
20 | 21 | ||
21 | #include <asm/io.h> | 22 | #include <asm/io.h> |
22 | #include <asm/oplib.h> | ||
23 | #include <asm/prom.h> | ||
24 | #include <asm/of_device.h> | ||
25 | #include <asm/fbio.h> | 23 | #include <asm/fbio.h> |
26 | 24 | ||
27 | #include "sbuslib.h" | 25 | #include "sbuslib.h" |
@@ -373,7 +371,7 @@ static int __devinit cg3_probe(struct of_device *op, | |||
373 | par->physbase = op->resource[0].start; | 371 | par->physbase = op->resource[0].start; |
374 | par->which_io = op->resource[0].flags & IORESOURCE_BITS; | 372 | par->which_io = op->resource[0].flags & IORESOURCE_BITS; |
375 | 373 | ||
376 | sbusfb_fill_var(&info->var, dp->node, 8); | 374 | sbusfb_fill_var(&info->var, dp, 8); |
377 | info->var.red.length = 8; | 375 | info->var.red.length = 8; |
378 | info->var.green.length = 8; | 376 | info->var.green.length = 8; |
379 | info->var.blue.length = 8; | 377 | info->var.blue.length = 8; |
@@ -398,7 +396,7 @@ static int __devinit cg3_probe(struct of_device *op, | |||
398 | if (!info->screen_base) | 396 | if (!info->screen_base) |
399 | goto out_unmap_regs; | 397 | goto out_unmap_regs; |
400 | 398 | ||
401 | cg3_blank(0, info); | 399 | cg3_blank(FB_BLANK_UNBLANK, info); |
402 | 400 | ||
403 | if (!of_find_property(dp, "width", NULL)) { | 401 | if (!of_find_property(dp, "width", NULL)) { |
404 | err = cg3_do_default_mode(par); | 402 | err = cg3_do_default_mode(par); |