Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[cascardo/linux.git] / include / video / neomagic.h

diff --git a/include/video/neomagic.h b/include/video/neomagic.h
index 08b6637..bc5013e 100644 (file)
--- a/include/video/neomagic.h
+++ b/include/video/neomagic.h
@@ -129,7 +129,7 @@ struct neofb_par {
        unsigned char CRTC[25];         /* Crtc Controller */
        unsigned char Sequencer[5];     /* Video Sequencer */
        unsigned char Graphics[9];      /* Video Graphics */
-       unsigned char Attribute[21];    /* Video Atribute */
+       unsigned char Attribute[21];    /* Video Attribute */
 
        unsigned char GeneralLockReg;
        unsigned char ExtCRTDispAddr;