Merge branch 'async-tx-fixes-for-linus' of git://lost.foo-projects.org/~dwillia2...

[linux-2.6-omap-h63xx.git] / drivers / video / matrox / matroxfb_accel.c

diff --git a/drivers/video/matrox/matroxfb_accel.c b/drivers/video/matrox/matroxfb_accel.c
index a5c825d994661090c990e6423fb6245a063902b1..3660d2673bdc9064f988858830dca640e1c10be1 100644 (file)
--- a/drivers/video/matrox/matroxfb_accel.c
+++ b/drivers/video/matrox/matroxfb_accel.c
@@ -70,7 +70,7 @@
  *     (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
  *
  * (following author is not in any relation with this code, but his ideas
- *  were used when writting this driver)
+ *  were used when writing this driver)
  *
  *              FreeVBE/AF (Matrox), "Shawn Hargreaves" <shawn@talula.demon.co.uk>
  *
@@ -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);
@@ -145,13 +143,10 @@ void matrox_cfbX_init(WPMINFO2) {
                                        ACCESS_FBINFO(fbops).fb_imageblit = matroxfb_imageblit;
                                }
                                break;
-               case 16:        if (ACCESS_FBINFO(fbcon).var.green.length == 5) {
+               case 16:        if (ACCESS_FBINFO(fbcon).var.green.length == 5)
                                        maccess = 0xC0000001;
-                                       ACCESS_FBINFO(cmap[16]) = 0x7FFF7FFF;
-                               } else {
+                               else
                                        maccess = 0x40000001;
-                                       ACCESS_FBINFO(cmap[16]) = 0xFFFFFFFF;
-                               }
                                mopmode = M_OPMODE_16BPP;
                                if (accel) {
                                        ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;
@@ -161,7 +156,6 @@ void matrox_cfbX_init(WPMINFO2) {
                                break;
                case 24:        maccess = 0x00000003;
                                mopmode = M_OPMODE_24BPP;
-                               ACCESS_FBINFO(cmap[16]) = 0xFFFFFFFF;
                                if (accel) {
                                        ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;
                                        ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;
@@ -170,7 +164,6 @@ void matrox_cfbX_init(WPMINFO2) {
                                break;
                case 32:        maccess = 0x00000002;
                                mopmode = M_OPMODE_32BPP;
-                               ACCESS_FBINFO(cmap[16]) = 0xFFFFFFFF;
                                if (accel) {
                                        ACCESS_FBINFO(fbops).fb_copyarea = matroxfb_copyarea;
                                        ACCESS_FBINFO(fbops).fb_fillrect = matroxfb_fillrect;