projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream.
[cascardo/linux.git]
/
drivers
/
video
/
matrox
/
matroxfb_crtc2.h
diff --git
a/drivers/video/matrox/matroxfb_crtc2.h
b/drivers/video/matrox/matroxfb_crtc2.h
index
1771776
..
1005582
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[1
7
];
+ u_int32_t cmap[1
6
];
};
#endif /* __MATROXFB_CRTC2_H__ */