Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree

[mv-sheeva.git] / drivers / video / aty / atyfb_base.c

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index bb20987d58afe4e22c4eb6484bc6673d412c4d26..5f1b5807a48fd79fc43a09470facd03d8b4d7ece 100644 (file)
--- 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",