git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
crypto: crypto4xx - Use crypto_ahash_set_reqsize
[safe/jmp/linux-2.6]
/
drivers
/
video
/
ffb.c
diff --git
a/drivers/video/ffb.c
b/drivers/video/ffb.c
index
02a6114
..
9dbb964
100644
(file)
--- 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/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/io.h>
#include <asm/upa.h>
-#include <asm/prom.h>
-#include <asm/of_device.h>
#include <asm/fbio.h>
#include "sbuslib.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;
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);
par->fbsize = PAGE_ALIGN(info->var.xres * info->var.yres * 4);
ffb_fixup_var_rgb(&info->var);
@@
-987,7
+986,7
@@
static int __devinit ffb_probe(struct of_device *op,
* chosen console, it will have video outputs off in
* the DAC.
*/
* chosen console, it will have video outputs off in
* the DAC.
*/
- ffb_blank(
0
, info);
+ ffb_blank(
FB_BLANK_UNBLANK
, info);
if (fb_alloc_cmap(&info->cmap, 256, 0))
goto out_unmap_dac;
if (fb_alloc_cmap(&info->cmap, 256, 0))
goto out_unmap_dac;
@@
-1000,7
+999,7
@@
static int __devinit ffb_probe(struct of_device *op,
dev_set_drvdata(&op->dev, info);
dev_set_drvdata(&op->dev, info);
- printk("%s: %s at %016lx, type %d, "
+ printk(
KERN_INFO
"%s: %s at %016lx, type %d, "
"DAC pnum[%x] rev[%d] manuf_rev[%d]\n",
dp->full_name,
((par->flags & FFB_FLAG_AFB) ? "AFB" : "FFB"),
"DAC pnum[%x] rev[%d] manuf_rev[%d]\n",
dp->full_name,
((par->flags & FFB_FLAG_AFB) ? "AFB" : "FFB"),
@@
-1043,7
+1042,7
@@
static int __devexit ffb_remove(struct of_device *op)
return 0;
}
return 0;
}
-static struct of_device_id ffb_match[] = {
+static
const
struct of_device_id ffb_match[] = {
{
.name = "SUNW,ffb",
},
{
.name = "SUNW,ffb",
},