diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-09 11:29:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-09 11:29:31 -0500 |
| commit | 437f2f91d6597c67662f847d9ed4c99cb3c440cd (patch) | |
| tree | 9051f1a9cccd9951f1c7eb89f064d27c1b592497 /drivers | |
| parent | 4d9c6a21befe6c73c35f2799c7e25a9eda82a95d (diff) | |
| parent | baa745a3378046ca1c5477495df6ccbec7690428 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/omap/omapfb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index 5a5e407dc45f..1a49519dafa4 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
| @@ -392,7 +392,7 @@ static void set_fb_fix(struct fb_info *fbi) | |||
| 392 | int bpp; | 392 | int bpp; |
| 393 | 393 | ||
| 394 | rg = &plane->fbdev->mem_desc.region[plane->idx]; | 394 | rg = &plane->fbdev->mem_desc.region[plane->idx]; |
| 395 | fbi->screen_base = (char __iomem *)rg->vaddr; | 395 | fbi->screen_base = rg->vaddr; |
| 396 | fix->smem_start = rg->paddr; | 396 | fix->smem_start = rg->paddr; |
| 397 | fix->smem_len = rg->size; | 397 | fix->smem_len = rg->size; |
| 398 | 398 | ||