VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / video / matrox / matroxfb_base.h

diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index de00f84..18938f1 100644 (file)
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -217,21 +217,21 @@ static inline void mga_memcpy_toio(vaddr_t va, unsigned int offs, const void* sr
 #ifdef MEMCPYTOIO_WORKS
        memcpy_toio(va.vaddr + offs, src, len);
 #elif defined(MEMCPYTOIO_WRITEL)
-#define srcd ((const u_int32_t*)src)
        if (offs & 3) {
                while (len >= 4) {
-                       mga_writel(va, offs, get_unaligned(srcd++));
+                       mga_writel(va, offs, get_unaligned((u32 *)src));
                        offs += 4;
                        len -= 4;
+                       src += 4;
                }
        } else {
                while (len >= 4) {
-                       mga_writel(va, offs, *srcd++);
+                       mga_writel(va, offs, *(u32 *)src);
                        offs += 4;
                        len -= 4;
+                       src += 4;
                }
        }
-#undef srcd
        if (len) {
                u_int32_t tmp;
 
@@ -479,6 +479,7 @@ struct matrox_fb_info {
        struct matrox_altout*   output;
        void*                   data;
        unsigned int            mode;
+       unsigned int            default_src;
                              } outputs[MATROXFB_MAX_OUTPUTS];
 
 #define MATROXFB_MAX_FB_DRIVERS                5