linux-next: manual merge of the staging tree with the fbdev tree

Stephen Rothwell
2011-01-07T02:35:19Z

drivers/video/udlfb.c between commit realloc_framebuffer ("video: udlfb:
Kill off special printk wrappers, use pr_fmt()") from the fbdev tree and
commit 5b84cc781058bb452f869d84bb24442ec51948c4 ("staging: Use vzalloc")
from the staging tree.

Another commit in the fbdev tree moves this file out of staging (from
drivers/staging/udlfb/udlfb.c).

I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/video/udlfb.c
index 020589a,8dd21e0..0000000
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@@ -1128,9 -1163,9 +1128,9 @@@ static int dlfb_realloc_framebuffer(str
* But with imperfect damage info we may send pixels over USB
* that were, in fact, unchanged - wasting limited USB bandwidth
*/
- new_back = vmalloc(new_len);
+ new_back = vzalloc(new_len);
if (!new_back)
- pr_info("No shadow/backing buffer allcoated\n");
- dl_info("No shadow/backing buffer allocated\n");
++ pr_info("No shadow/backing buffer allocated\n");
else {
if (dev->backing_buffer)
vfree(dev->backing_buffer);