diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-25 02:01:25 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-25 02:01:25 -0400 |
| commit | 087faf77a57b06f9a8ce37781c68e3f02468322b (patch) | |
| tree | 4c82cc3a0dbee524efde56901c5674281c831675 /drivers/video | |
| parent | e2968f7018193eb5385a925225f135c9ba61eb93 (diff) | |
| parent | eae9b85b5f65027df64130d8a3eeb2de9d094eda (diff) | |
Merge branch 'common/fbdev-meram' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index aa4fe993b6da..404c03b4b7c7 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
| @@ -610,7 +610,8 @@ static int sh_mobile_lcdc_start(struct sh_mobile_lcdc_priv *priv) | |||
| 610 | pitch = ch->info->fix.line_length; | 610 | pitch = ch->info->fix.line_length; |
| 611 | 611 | ||
| 612 | /* test if we can enable meram */ | 612 | /* test if we can enable meram */ |
| 613 | if (ch->cfg.meram_cfg && priv->meram_dev) { | 613 | if (ch->cfg.meram_cfg && priv->meram_dev && |
| 614 | priv->meram_dev->ops) { | ||
| 614 | struct sh_mobile_meram_cfg *cfg; | 615 | struct sh_mobile_meram_cfg *cfg; |
| 615 | struct sh_mobile_meram_info *mdev; | 616 | struct sh_mobile_meram_info *mdev; |
| 616 | unsigned long icb_addr_y, icb_addr_c; | 617 | unsigned long icb_addr_y, icb_addr_c; |