diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 22:55:28 +1000 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 22:55:28 +1000 |
commit | 0c929238ca4baefe47f4034732db4c154f2329c6 (patch) | |
tree | 2636079800fa045501982a70e1be0425c1b968c2 /drivers/video/controlfb.c | |
parent | 6d7120a713300283a8b73e7d86cd1bab8b9d1971 (diff) | |
parent | 78da107a7ed14fbc6ef77ff4c41d92b11edc9036 (diff) |
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'drivers/video/controlfb.c')
-rw-r--r-- | drivers/video/controlfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c index 7b2c40abae1..0c189b32a4c 100644 --- a/drivers/video/controlfb.c +++ b/drivers/video/controlfb.c @@ -420,7 +420,7 @@ static int __init init_control(struct fb_info_control *p) /* Try to pick a video mode out of NVRAM if we have one. */ #ifdef CONFIG_NVRAM - if (default_cmode == CMODE_NVRAM){ + if (default_cmode == CMODE_NVRAM) { cmode = nvram_read_byte(NV_CMODE); if(cmode < CMODE_8 || cmode > CMODE_32) cmode = CMODE_8; |