vserver 1.9.3

[linux-2.6.git] / drivers / video / matrox / matroxfb_crtc2.c

diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c
index 27221ec..75d1969 100644 (file)
--- a/drivers/video/matrox/matroxfb_crtc2.c
+++ b/drivers/video/matrox/matroxfb_crtc2.c
@@ -437,7 +437,7 @@ static int matroxfb_dh_ioctl(struct inode* inode,
                                err = matroxfb_dh_get_vblank(m2info, &vblank);
                                if (err)
                                        return err;
-                               if (copy_to_user((struct fb_vblank*)arg, &vblank, sizeof(vblank)))
+                               if (copy_to_user((void __user *)arg, &vblank, sizeof(vblank)))
                                        return -EFAULT;
                                return 0;
                        }
@@ -445,7 +445,7 @@ static int matroxfb_dh_ioctl(struct inode* inode,
                        {
                                u_int32_t crt;
 
-                               if (get_user(crt, (u_int32_t *)arg))
+                               if (get_user(crt, (u_int32_t __user *)arg))
                                        return -EFAULT;
 
                                if (crt != 0)
@@ -464,7 +464,7 @@ static int matroxfb_dh_ioctl(struct inode* inode,
                                int out;
                                int changes;
 
-                               if (get_user(tmp, (u_int32_t*)arg))
+                               if (get_user(tmp, (u_int32_t __user *)arg))
                                        return -EFAULT;
                                for (out = 0; out < 32; out++) {
                                        if (tmp & (1 << out)) {
@@ -514,7 +514,7 @@ static int matroxfb_dh_ioctl(struct inode* inode,
                                                conn |= 1 << out;
                                        }
                                }
-                               if (put_user(conn, (u_int32_t*)arg))
+                               if (put_user(conn, (u_int32_t __user *)arg))
                                        return -EFAULT;
                                return 0;
                        }
@@ -539,7 +539,7 @@ static int matroxfb_dh_ioctl(struct inode* inode,
                                                tmp = 0;
                                        }
                                }
-                               if (put_user(tmp, (u_int32_t*)arg))
+                               if (put_user(tmp, (u_int32_t __user *)arg))
                                        return -EFAULT;
                                return 0;
                        }
@@ -628,15 +628,6 @@ static int matroxfb_dh_regit(CPMINFO struct matroxfb_dh_fb_info* m2info) {
        m2info->mmio.vbase = ACCESS_FBINFO(mmio.vbase);
        m2info->mmio.len = ACCESS_FBINFO(mmio.len);
 
-       /*
-        *  If we have unused output, connect CRTC2 to it...
-        */
-       if (ACCESS_FBINFO(outputs[1]).output &&
-           ACCESS_FBINFO(outputs[1]).src == MATROXFB_SRC_NONE &&
-           ACCESS_FBINFO(outputs[2]).src == MATROXFB_SRC_NONE) {
-               ACCESS_FBINFO(outputs[1]).src = MATROXFB_SRC_CRTC2;
-       }
-
        matroxfb_dh_init_fix(m2info);
        if (register_framebuffer(&m2info->fbcon)) {
                return -ENXIO;
@@ -730,6 +721,9 @@ static struct matroxfb_driver crtc2 = {
                .remove =       matroxfb_crtc2_remove };
 
 static int matroxfb_crtc2_init(void) {
+       if (fb_get_options("matrox_crtc2fb", NULL))
+               return -ENODEV;
+
        matroxfb_register_driver(&crtc2);
        return 0;
 }