diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-11-26 22:06:58 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-11-26 22:06:58 +0100 |
| commit | 9811283a233b55428a99771f803d2ca0f80d29de (patch) | |
| tree | f41b7c5958f865c1015c3e2f29f0ffdfccdc78e6 /drivers/mfd/glamo/glamo-fb.c | |
| parent | dd6196f5cc0cd707e7f694f52d7e847e066a1967 (diff) | |
| parent | b90406de472c1aa5371ab593a2bb79136d5de658 (diff) | |
Merge branch 'andy-tracking' into drm-tracking
Diffstat (limited to 'drivers/mfd/glamo/glamo-fb.c')
| -rw-r--r-- | drivers/mfd/glamo/glamo-fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index 06bbe8a505f..f2f92bcfe66 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -128,7 +128,7 @@ static struct glamo_script glamo_regs[] = { * 01 00 0 100 0 000 01 0 0 */ /* The following values assume 640*480@16bpp */ { GLAMO_REG_LCD_A_BASE1, 0x0000 }, /* display A base address 15:0 */ - { GLAMO_REG_LCD_A_BASE2, 0x0000 }, /* display A base address 22:16 */ + { GLAMO_REG_LCD_A_BASE2, 0x4000 }, /* display A base address 22:16 */ { GLAMO_REG_LCD_B_BASE1, 0x6000 }, /* display B base address 15:0 */ { GLAMO_REG_LCD_B_BASE2, 0x0009 }, /* display B base address 22:16 */ { GLAMO_REG_LCD_CURSOR_BASE1, 0xC000 }, /* cursor base address 15:0 */ |