diff --git a/[refs] b/[refs] index fc5aac24030e..56d10af06ecd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec621699031b298eadd7e364f65281291b19ea37 +refs/heads/master: 4d1e4e5a6387aad97590e2da9c6db1350f22f63a diff --git a/trunk/drivers/video/imxfb.c b/trunk/drivers/video/imxfb.c index 8f7a2b2c78e7..15a0ee6d8e23 100644 --- a/trunk/drivers/video/imxfb.c +++ b/trunk/drivers/video/imxfb.c @@ -327,7 +327,7 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) break; case 16: default: - if (readl(fbi->regs + LCDC_PCR) & PCR_TFT) + if (fbi->pcr & PCR_TFT) rgb = &def_rgb_16_tft; else rgb = &def_rgb_16_stn;