diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-06 18:18:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-06 18:18:43 -0700 |
| commit | bd1d23a81083f03ac63afbb7656b87eed04d8953 (patch) | |
| tree | 61845e5e70f971e0eafc7881db8cc9fb1e85dc73 /drivers/video/ffb.c | |
| parent | c0a18111e571138747a98af18b3a2124df56a0d1 (diff) | |
| parent | d45100f7b69e3d9cd0cd5e956b6ac2c78d460d07 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix initrd regression.
usb: Sparc build fix, make USB_ISP1760_OF depend on PPC_OF
sparc64: remove online_page()
sparc64: use compat_sys_utimes instead of home-grown local copy.
sbus: Fix bpp driver build.
sparc video: make blank use proper constant
Revert "[SPARC64]: Wrap SMP IPIs with irq_enter()/irq_exit()."
sparc: tcx.c remove unnecessary function
Diffstat (limited to 'drivers/video/ffb.c')
| -rw-r--r-- | drivers/video/ffb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index 93dca3e2aa5..0f42a696d17 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c @@ -987,7 +987,7 @@ static int __devinit ffb_probe(struct of_device *op, * 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; |