diff --git a/[refs] b/[refs] index db085c60384d..f2ee5804768d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea237a6ae953b19d03f29236f095389d7906a0b4 +refs/heads/master: cb85063ae806e14f653f6e1fa7ffb63c6b9a4f0e diff --git a/trunk/drivers/video/fbmon.c b/trunk/drivers/video/fbmon.c index 4ba9c0894416..3f3a4e97a300 100644 --- a/trunk/drivers/video/fbmon.c +++ b/trunk/drivers/video/fbmon.c @@ -686,7 +686,7 @@ static int fb_get_monitor_limits(unsigned char *edid, struct fb_monspecs *specs) /* estimate monitor limits based on modes supported */ if (retval) { struct fb_videomode *modes, *mode; - int num_modes, i, hz, hscan, pixclock; + int num_modes, hz, hscan, pixclock; int vtotal, htotal; modes = fb_create_modedb(edid, &num_modes);