diff --git a/[refs] b/[refs] index 51598b08ad53..a8bc63384d56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97cab45583f75428773547f3bbe59fece05420d3 +refs/heads/master: 5345010cc8e87af7f1f48e5c816b10f96f474da1 diff --git a/trunk/drivers/video/controlfb.c b/trunk/drivers/video/controlfb.c index 7b2c40abae15..0c189b32a4c5 100644 --- a/trunk/drivers/video/controlfb.c +++ b/trunk/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;