diff options
Diffstat (limited to 'drivers/video/epson1355fb.c')
-rw-r--r-- | drivers/video/epson1355fb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c index ca2c54ce508e..67f58bae384d 100644 --- a/drivers/video/epson1355fb.c +++ b/drivers/video/epson1355fb.c | |||
@@ -63,6 +63,7 @@ | |||
63 | 63 | ||
64 | struct epson1355_par { | 64 | struct epson1355_par { |
65 | unsigned long reg_addr; | 65 | unsigned long reg_addr; |
66 | u32 pseudo_palette[16]; | ||
66 | }; | 67 | }; |
67 | 68 | ||
68 | /* ------------------------------------------------------------------------- */ | 69 | /* ------------------------------------------------------------------------- */ |
@@ -635,7 +636,7 @@ int __init epson1355fb_probe(struct platform_device *dev) | |||
635 | goto bail; | 636 | goto bail; |
636 | } | 637 | } |
637 | 638 | ||
638 | info = framebuffer_alloc(sizeof(struct epson1355_par) + sizeof(u32) * 256, &dev->dev); | 639 | info = framebuffer_alloc(sizeof(struct epson1355_par), &dev->dev); |
639 | if (!info) { | 640 | if (!info) { |
640 | rc = -ENOMEM; | 641 | rc = -ENOMEM; |
641 | goto bail; | 642 | goto bail; |
@@ -648,7 +649,7 @@ int __init epson1355fb_probe(struct platform_device *dev) | |||
648 | rc = -ENOMEM; | 649 | rc = -ENOMEM; |
649 | goto bail; | 650 | goto bail; |
650 | } | 651 | } |
651 | info->pseudo_palette = (void *)(default_par + 1); | 652 | info->pseudo_palette = default_par->pseudo_palette; |
652 | 653 | ||
653 | info->screen_base = ioremap(EPSON1355FB_FB_PHYS, EPSON1355FB_FB_LEN); | 654 | info->screen_base = ioremap(EPSON1355FB_FB_PHYS, EPSON1355FB_FB_LEN); |
654 | if (!info->screen_base) { | 655 | if (!info->screen_base) { |