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

[~andy/linux] / drivers / video / matrox / matroxfb_crtc2.h

diff --git a/drivers/video/matrox/matroxfb_crtc2.h b/drivers/video/matrox/matroxfb_crtc2.h
index 177177609be77c095fbbd721e5489d53d96e3396..1005582e843e5084cecd6d99175c8168e0e1a375 100644 (file)
--- a/drivers/video/matrox/matroxfb_crtc2.h
+++ b/drivers/video/matrox/matroxfb_crtc2.h
@@ -28,7 +28,7 @@ struct matroxfb_dh_fb_info {
 
        unsigned int            interlaced:1;
 
-       u_int32_t cmap[17];
+       u_int32_t cmap[16];
 };
 
 #endif /* __MATROXFB_CRTC2_H__ */