diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-23 05:43:48 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-23 05:43:48 -0400 |
| commit | a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc (patch) | |
| tree | bfdc42183f5aac21f605a30a4a511298ab91e3c5 /drivers/video | |
| parent | 955c9863bb5855a994751843e7066017edc00410 (diff) | |
| parent | 5bdef865eb358b6f3760e25e591ae115e9eeddef (diff) | |
Merge branch 'sh/kfr2r09'
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbmon.c | 4 |
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) | |||
| 256 | 256 | ||
| 257 | static int edid_checksum(unsigned char *edid) | 257 | static int edid_checksum(unsigned char *edid) |
| 258 | { | 258 | { |
| 259 | unsigned char i, csum = 0, all_null = 0; | 259 | unsigned char csum = 0, all_null = 0; |
| 260 | int err = 0, fix = check_edid(edid); | 260 | int i, err = 0, fix = check_edid(edid); |
| 261 | 261 | ||
| 262 | if (fix) | 262 | if (fix) |
| 263 | fix_edid(edid, fix); | 263 | fix_edid(edid, fix); |