diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 16:38:25 -0500 |
| commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
| tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /drivers/video/aty | |
| parent | 6016a363f6b56b46b24655bcfc0499b715851cf3 (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'drivers/video/aty')
| -rw-r--r-- | drivers/video/aty/atyfb_base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index bb20987d58af..5f1b5807a48f 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
| @@ -3276,7 +3276,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base) | |||
| 3276 | txtformat = "24 bit interface"; | 3276 | txtformat = "24 bit interface"; |
| 3277 | break; | 3277 | break; |
| 3278 | default: | 3278 | default: |
| 3279 | txtformat = "unkown format"; | 3279 | txtformat = "unknown format"; |
| 3280 | } | 3280 | } |
| 3281 | } else { | 3281 | } else { |
| 3282 | switch (format & 7) { | 3282 | switch (format & 7) { |
| @@ -3299,7 +3299,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base) | |||
| 3299 | txtformat = "262144 colours (FDPI-2 mode)"; | 3299 | txtformat = "262144 colours (FDPI-2 mode)"; |
| 3300 | break; | 3300 | break; |
| 3301 | default: | 3301 | default: |
| 3302 | txtformat = "unkown format"; | 3302 | txtformat = "unknown format"; |
| 3303 | } | 3303 | } |
| 3304 | } | 3304 | } |
| 3305 | PRINTKI("%s%s %s monitor detected: %s\n", | 3305 | PRINTKI("%s%s %s monitor detected: %s\n", |