projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
[cascardo/linux.git]
/
drivers
/
video
/
mx3fb.c
diff --git
a/drivers/video/mx3fb.c
b/drivers/video/mx3fb.c
index
804f874
..
142e860
100644
(file)
--- a/
drivers/video/mx3fb.c
+++ b/
drivers/video/mx3fb.c
@@
-1263,7
+1263,7
@@
static int mx3fb_map_video_memory(struct fb_info *fbi, unsigned int mem_len,
fbi->screen_base = dma_alloc_writecombine(fbi->device,
mem_len,
- &addr, GFP_DMA);
+ &addr, GFP_DMA
| GFP_KERNEL
);
if (!fbi->screen_base) {
dev_err(fbi->device, "Cannot allocate %u bytes framebuffer memory\n",