projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 82094b55 AF |
1 | From: Greg Kroah-Hartman <gregkh@suse.de> |
| 2 | Subject: Linux 2.6.27.28 | |
| 3 | ||
| 4 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 5 | ||
| 6 | diff --git a/Makefile b/Makefile | |
| 7 | index 387a5fd..7598325 100644 | |
| 8 | --- a/Makefile | |
| 9 | +++ b/Makefile | |
| 10 | @@ -1,7 +1,7 @@ | |
| 11 | VERSION = 2 | |
| 12 | PATCHLEVEL = 6 | |
| 13 | SUBLEVEL = 27 | |
| 14 | -EXTRAVERSION = .27 | |
| 15 | +EXTRAVERSION = .28 | |
| 16 | NAME = Trembling Tortoise | |
| 17 | ||
| 18 | # *DOCUMENTATION* | |
| 19 | diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c | |
| 20 | index 6a0aa18..839b0bf 100644 | |
| 21 | --- a/drivers/video/fbmon.c | |
| 22 | +++ b/drivers/video/fbmon.c | |
| 23 | @@ -256,8 +256,8 @@ static void fix_edid(unsigned char *edid, int fix) | |
| 24 | ||
| 25 | static int edid_checksum(unsigned char *edid) | |
| 26 | { | |
| 27 | - unsigned char i, csum = 0, all_null = 0; | |
| 28 | - int err = 0, fix = check_edid(edid); | |
| 29 | + unsigned char csum = 0, all_null = 0; | |
| 30 | + int i, err = 0, fix = check_edid(edid); | |
| 31 | ||
| 32 | if (fix) | |
| 33 | fix_edid(edid, fix); |