summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-07-23 18:43:48 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-07-23 18:43:48 +0900
commita3beddd0aa267986de7b13b6d9cd0e1869fcf1fc (patch)
treebfdc42183f5aac21f605a30a4a511298ab91e3c5 /drivers/video
parent955c9863bb5855a994751843e7066017edc00410 (diff)
parent5bdef865eb358b6f3760e25e591ae115e9eeddef (diff)
downloadlinux-a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc.tar.gz
linux-a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc.tar.bz2
linux-a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc.zip
Merge branch 'sh/kfr2r09'
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbmon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c
index 5c1a2c01778f..9ae9cd32bd06 100644
--- a/drivers/video/fbmon.c
+++ b/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);