diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 10:57:42 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 10:57:42 -0800 |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /drivers/video/aty/atyfb_base.c | |
| parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
| parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
| download | op-kernel-dev-5c6baba84e1ac6a79b266b40e17e692aab6604a1.zip op-kernel-dev-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.gz | |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'drivers/video/aty/atyfb_base.c')
| -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 913b4a4..1ddeb4c 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) txtformat = "24 bit interface"; break; default: - txtformat = "unkown format"; + txtformat = "unknown format"; } } else { switch (format & 7) { @@ -3299,7 +3299,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base) txtformat = "262144 colours (FDPI-2 mode)"; break; default: - txtformat = "unkown format"; + txtformat = "unknown format"; } } PRINTKI("%s%s %s monitor detected: %s\n", |
