Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into...

[~andy/linux] / include / video / neomagic.h

diff --git a/include/video/neomagic.h b/include/video/neomagic.h
index 08b663782956a3aa3f295acc17c7bf581173ca83..bc5013e8059d562cbffd46c214c7c7e485abf76d 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;