diff --git a/[refs] b/[refs] index 9a17df27caa7..f2a483d2294d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aea1f7964ae6cba5eb419a958956deb9016b3341 +refs/heads/master: 3730793d457fed79a6d49bae72996d458c8e4f2d diff --git a/trunk/drivers/video/fbmon.c b/trunk/drivers/video/fbmon.c index 5c1a2c01778f..9ae9cd32bd06 100644 --- a/trunk/drivers/video/fbmon.c +++ b/trunk/drivers/video/fbmon.c @@ -256,8 +256,8 @@ static void fix_edid(unsigned char *edid, int fix) static int edid_checksum(unsigned char *edid) { - unsigned char i, csum = 0, all_null = 0; - int err = 0, fix = check_edid(edid); + unsigned char csum = 0, all_null = 0; + int i, err = 0, fix = check_edid(edid); if (fix) fix_edid(edid, fix);