Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mv-sheeva.git] / drivers / gpu / drm / mga / mga_state.c

diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c
index b710fab21cb375e946d19ec099a1c1c81208a72a..a53b848e0f17cbbceb062d3b8ff648098deb0985 100644 (file)
--- a/drivers/gpu/drm/mga/mga_state.c
+++ b/drivers/gpu/drm/mga/mga_state.c
@@ -239,7 +239,7 @@ static __inline__ void mga_g200_emit_pipe(drm_mga_private_t * dev_priv)
                  MGA_WR34, 0x00000000,
                  MGA_WR42, 0x0000ffff, MGA_WR60, 0x0000ffff);
 
-       /* Padding required to to hardware bug.
+       /* Padding required due to hardware bug.
         */
        DMA_BLOCK(MGA_DMAPAD, 0xffffffff,
                  MGA_DMAPAD, 0xffffffff,
@@ -317,7 +317,7 @@ static __inline__ void mga_g400_emit_pipe(drm_mga_private_t * dev_priv)
                  MGA_WR52, MGA_G400_WR_MAGIC,  /* tex1 width        */
                  MGA_WR60, MGA_G400_WR_MAGIC); /* tex1 height       */
 
-       /* Padding required to to hardware bug */
+       /* Padding required due to hardware bug */
        DMA_BLOCK(MGA_DMAPAD, 0xffffffff,
                  MGA_DMAPAD, 0xffffffff,
                  MGA_DMAPAD, 0xffffffff,