diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 10:06:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 10:06:27 +1100 |
| commit | 25895b6441a7eb1d09da80465e3317c0579ac67a (patch) | |
| tree | d4c719c20d975476a7fc24f6e9c41c26f4a472f4 /drivers | |
| parent | f6f7b52e2f6149d2ee365717afff315b05720162 (diff) | |
| parent | 82676d76252680fc035247fd4cfdb07ffce5db52 (diff) | |
Merge commit 'arm-current/master'
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) 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; |