diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-15 23:03:50 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-15 23:03:50 -0500 |
| commit | eb14f019597cd86c21a6c601d7e900f40030c2e7 (patch) | |
| tree | 36fb2f36a1747f98988f87215db1eef3a71d45eb /drivers/video/omap/omapfb_main.c | |
| parent | 9a4a84294b0d60b8c287131478f743ba2bc68949 (diff) | |
| parent | a3dd15444baa9c7522c8457ab564c41219dfb44c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
Diffstat (limited to 'drivers/video/omap/omapfb_main.c')
| -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 | ||