fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/video/matrox/matroxfb_g450.c b/drivers/video/matrox/matroxfb_g450.c
index 780dc6a..4d610b4 100644 (file)
--- a/drivers/video/matrox/matroxfb_g450.c
+++ b/drivers/video/matrox/matroxfb_g450.c
@@ -20,6 +20,8 @@
 #include <asm/uaccess.h>
 #include <asm/div64.h>
 
+#include "matroxfb_g450.h"
+
 /* Definition of the various controls */
 struct mctl {
        struct v4l2_queryctrl desc;
@@ -57,7 +59,7 @@ static const struct mctl g450_controls[] =
        }, offsetof(struct matrox_fb_info, altout.tvo_params.testout) },
 };
 
-#define G450CTRLS (sizeof(g450_controls)/sizeof(g450_controls[0]))
+#define G450CTRLS ARRAY_SIZE(g450_controls)
 
 /* Return: positive number: id found
            -EINVAL:         id not found, return failure
@@ -591,11 +593,11 @@ void matroxfb_g450_connect(WPMINFO2) {
        if (ACCESS_FBINFO(devflags.g450dac)) {
                down_write(&ACCESS_FBINFO(altout.lock));
                tvo_fill_defaults(PMINFO2);
-               ACCESS_FBINFO(outputs[1]).src = MATROXFB_SRC_CRTC1;
+               ACCESS_FBINFO(outputs[1]).src = ACCESS_FBINFO(outputs[1]).default_src;
                ACCESS_FBINFO(outputs[1]).data = MINFO;
                ACCESS_FBINFO(outputs[1]).output = &matroxfb_g450_altout;
                ACCESS_FBINFO(outputs[1]).mode = MATROXFB_OUTPUT_MODE_MONITOR;
-               ACCESS_FBINFO(outputs[2]).src = MATROXFB_SRC_CRTC1;
+               ACCESS_FBINFO(outputs[2]).src = ACCESS_FBINFO(outputs[2]).default_src;
                ACCESS_FBINFO(outputs[2]).data = MINFO;
                ACCESS_FBINFO(outputs[2]).output = &matroxfb_g450_dvi;
                ACCESS_FBINFO(outputs[2]).mode = MATROXFB_OUTPUT_MODE_MONITOR;