mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Fix alignment fault handling for ARMv6 and later CPUs [ARM] 5340/1: fix stack placement after noexecstack changes [ARM] 5339/1: fix __fls() on ARM [ARM] Orion: fix bug in pcie configuration cycle function field mask [ARM] omap: fix a pile of issues
This commit is contained in:
commit
437f2f91d6
8 changed files with 43 additions and 19 deletions
|
|
@ -392,7 +392,7 @@ static void set_fb_fix(struct fb_info *fbi)
|
|||
int bpp;
|
||||
|
||||
rg = &plane->fbdev->mem_desc.region[plane->idx];
|
||||
fbi->screen_base = (char __iomem *)rg->vaddr;
|
||||
fbi->screen_base = rg->vaddr;
|
||||
fix->smem_start = rg->paddr;
|
||||
fix->smem_len = rg->size;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue