diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 16:51:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-24 16:51:14 -0700 |
| commit | 1ff31056fb044a47cdda462bdef0dcacefbf6856 (patch) | |
| tree | 9bcc91b718769ed73828cc1891c7e1e26e79a8fc /drivers/video | |
| parent | 6c75969e22ffe27df64ff7477bd35fe72bface3e (diff) | |
| parent | bb456928913fda2b360376afb13d9a0bc72c761c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Orion5x: replace KEY_WLAN with KEY_WPS_BUTTON
[ARM] Kirkwood: WPS button keycode mapping
pxa168fb: fix incorrect resource calculation
[ARM] pxa/raumfeld: fix button name
[ARM] pxa/raumfeld: remove duplicated #include
[ARM] locomo: fix unpaired spin_lock_irqsave
[ARM] locomo: fix SPI register offset
[ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pm
[ARM] pxa: remove unnecessary 'select FB_W100' from some platforms
[ARM] pxa: remove spi cs gpio direction to avoid clash with driver
[ARM] mmp: fix for variables in uncompress.h being discarded
[ARM] pxa: fix for variables in uncompress.h being discarded
ARM: Update mach-types
ARM: Fix IXP23xx build error in mach/memory.h
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/pxa168fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c index 75285d3f393c..c91a7f70f7b0 100644 --- a/drivers/video/pxa168fb.c +++ b/drivers/video/pxa168fb.c @@ -668,7 +668,7 @@ static int __init pxa168fb_probe(struct platform_device *pdev) /* * Map LCD controller registers. */ - fbi->reg_base = ioremap_nocache(res->start, res->end - res->start); + fbi->reg_base = ioremap_nocache(res->start, resource_size(res)); if (fbi->reg_base == NULL) { ret = -ENOMEM; goto failed; |