diff --git a/[refs] b/[refs] index 197abc03b8e1..5c1045055461 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3552f09a6ce0e42ccb67bf13ee9e4c31b080d6a3 +refs/heads/master: 84650346b20c8f8af35e3773506102ff1680e887 diff --git a/trunk/drivers/video/matrox/matroxfb_accel.c b/trunk/drivers/video/matrox/matroxfb_accel.c index 209fe697ecc7..3660d2673bdc 100644 --- a/trunk/drivers/video/matrox/matroxfb_accel.c +++ b/trunk/drivers/video/matrox/matroxfb_accel.c @@ -91,7 +91,6 @@ static inline void matrox_cfb4_pal(u_int32_t* pal) { for (i = 0; i < 16; i++) { pal[i] = i * 0x11111111U; } - pal[i] = 0xFFFFFFFF; } static inline void matrox_cfb8_pal(u_int32_t* pal) { @@ -100,7 +99,6 @@ static inline void matrox_cfb8_pal(u_int32_t* pal) { for (i = 0; i < 16; i++) { pal[i] = i * 0x01010101U; } - pal[i] = 0x0F0F0F0F; } static void matroxfb_copyarea(struct fb_info* info, const struct fb_copyarea* area);