11 files changed, 24 insertions, 33 deletions

diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 96498489199d..a1d0e9c9f286 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -26,7 +26,7 @@
 #define _BTTVP_H_
 
 #include <linux/version.h>
-#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,17)
+#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,18)
 
 #include <linux/types.h>
 #include <linux/wait.h>
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 02d980a29962..85642831ea8e 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -37,7 +37,7 @@
 #include <linux/version.h>
 #include <linux/mutex.h>
 
-#define CX23885_VERSION_CODE KERNEL_VERSION(0, 0, 1)
+#define CX23885_VERSION_CODE KERNEL_VERSION(0, 0, 2)
 
 #define UNSET (-1U)
 
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 9a43fdf20fae..7724d168fc04 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -41,7 +41,7 @@
 
 #include <linux/version.h>
 #include <linux/mutex.h>
-#define CX88_VERSION_CODE KERNEL_VERSION(0,0,6)
+#define CX88_VERSION_CODE KERNEL_VERSION(0,0,7)
 
 #define UNSET (-1U)
 
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 07d5ffea6e6f..b0195e8ee4d1 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -884,12 +884,9 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
         }
         else if (itv->card->type == IVTV_CARD_GV_MVPRX ||
                  itv->card->type == IVTV_CARD_GV_MVPRX2E) {
-                struct v4l2_crystal_freq crystal_freq;
-
                 /* The crystal frequency of GVMVPRX is 24.576MHz */
-                crystal_freq.freq = SAA7115_FREQ_24_576_MHZ;
-                crystal_freq.flags = SAA7115_FREQ_FL_UCGC;
-                v4l2_subdev_call(itv->sd_video, video, s_crystal_freq, &crystal_freq);
+                v4l2_subdev_call(itv->sd_video, video, s_crystal_freq,
+                        SAA7115_FREQ_24_576_MHZ, SAA7115_FREQ_FL_UCGC);
         }
 
         if (hw & IVTV_HW_CX25840) {
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index e212337c6513..e707ef3086b2 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -860,12 +860,9 @@ int ivtv_v4l2_close(struct file *filp)
                 ivtv_call_all(itv, core, s_std, itv->std);
                 /* Select correct audio input (i.e. TV tuner or Line in) */
                 ivtv_audio_set_io(itv);
-                if (itv->hw_flags & IVTV_HW_SAA711X)
-                {
-                        struct v4l2_crystal_freq crystal_freq;
-                        crystal_freq.freq = SAA7115_FREQ_32_11_MHZ;
-                        crystal_freq.flags = 0;
-                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq, &crystal_freq);
+                if (itv->hw_flags & IVTV_HW_SAA711X) {
+                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq,
+                                        SAA7115_FREQ_32_11_MHZ, 0);
                 }
                 if (atomic_read(&itv->capturing) > 0) {
                         /* Undo video mute */
@@ -956,10 +953,8 @@ static int ivtv_serialized_open(struct ivtv_stream *s, struct file *filp)
                 /* Select the correct audio input (i.e. radio tuner) */
                 ivtv_audio_set_io(itv);
                 if (itv->hw_flags & IVTV_HW_SAA711X) {
-                        struct v4l2_crystal_freq crystal_freq;
-                        crystal_freq.freq = SAA7115_FREQ_32_11_MHZ;
-                        crystal_freq.flags = SAA7115_FREQ_FL_APLL;
-                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq, &crystal_freq);
+                        ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq,
+                                SAA7115_FREQ_32_11_MHZ, SAA7115_FREQ_FL_APLL);
                 }
                 /* Done! Unmute and continue. */
                 ivtv_unmute(itv);
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index e8488430cdbd..c0e66a88be4f 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1313,17 +1313,16 @@ static int saa711x_s_stream(struct v4l2_subdev *sd, int enable)
         return 0;
 }
 
-static int saa711x_s_crystal_freq(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq)
+static int saa711x_s_crystal_freq(struct v4l2_subdev *sd, u32 freq, u32 flags)
 {
         struct saa711x_state *state = to_state(sd);
 
-        if (freq->freq != SAA7115_FREQ_32_11_MHZ &&
-                        freq->freq != SAA7115_FREQ_24_576_MHZ)
+        if (freq != SAA7115_FREQ_32_11_MHZ && freq != SAA7115_FREQ_24_576_MHZ)
                 return -EINVAL;
-        state->crystal_freq = freq->freq;
-        state->cgcdiv = (freq->flags & SAA7115_FREQ_FL_CGCDIV) ? 3 : 4;
-        state->ucgc = (freq->flags & SAA7115_FREQ_FL_UCGC) ? 1 : 0;
-        state->apll = (freq->flags & SAA7115_FREQ_FL_APLL) ? 1 : 0;
+        state->crystal_freq = freq;
+        state->cgcdiv = (flags & SAA7115_FREQ_FL_CGCDIV) ? 3 : 4;
+        state->ucgc = (flags & SAA7115_FREQ_FL_UCGC) ? 1 : 0;
+        state->apll = (flags & SAA7115_FREQ_FL_APLL) ? 1 : 0;
         saa711x_s_clock_freq(sd, state->audclk_freq);
         return 0;
 }
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index a2dd326de5b9..0cbaf90d4874 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -20,7 +20,7 @@
  */
 
 #include <linux/version.h>
-#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,14)
+#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,15)
 
 #include <linux/pci.h>
 #include <linux/i2c.h>
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index c8f8a3c4bbf8..d7056a5b7f9b 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -1,5 +1,5 @@
 /*
- * USB USBVISION Video device driver 0.9.9
+ * USB USBVISION Video device driver 0.9.10
  *
  *
  *
@@ -79,7 +79,7 @@
 #define DRIVER_LICENSE "GPL"
 #define USBVISION_DRIVER_VERSION_MAJOR 0
 #define USBVISION_DRIVER_VERSION_MINOR 9
-#define USBVISION_DRIVER_VERSION_PATCHLEVEL 9
+#define USBVISION_DRIVER_VERSION_PATCHLEVEL 10
 #define USBVISION_DRIVER_VERSION KERNEL_VERSION(USBVISION_DRIVER_VERSION_MAJOR,\
 USBVISION_DRIVER_VERSION_MINOR,\
 USBVISION_DRIVER_VERSION_PATCHLEVEL)
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 4912696c4a74..2fb745464311 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -60,8 +60,8 @@
 // #define VINO_DEBUG
 // #define VINO_DEBUG_INT
 
-#define VINO_MODULE_VERSION "0.0.5"
-#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 5)
+#define VINO_MODULE_VERSION "0.0.6"
+#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 6)
 
 MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver");
 MODULE_VERSION(VINO_MODULE_VERSION);
diff --git a/drivers/media/video/w9968cf.h b/drivers/media/video/w9968cf.h
index fdfc6a4e1c8f..73ad864b4842 100644
--- a/drivers/media/video/w9968cf.h
+++ b/drivers/media/video/w9968cf.h
@@ -134,7 +134,7 @@ static const struct w9968cf_format w9968cf_formatlist[] = {
 
 #define W9968CF_MODULE_NAME     "V4L driver for W996[87]CF JPEG USB " \
                                 "Dual Mode Camera Chip"
-#define W9968CF_MODULE_VERSION  "1:1.33-basic"
+#define W9968CF_MODULE_VERSION  "1:1.34-basic"
 #define W9968CF_MODULE_AUTHOR   "(C) 2002-2004 Luca Risolia"
 #define W9968CF_AUTHOR_EMAIL    "<luca.risolia@studio.unibo.it>"
 #define W9968CF_MODULE_LICENSE  "GPL"
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index afecf32f1a87..d439c76b27e1 100644
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -143,8 +143,8 @@ Private IOCTL to set up for displaying MJPEG
 #ifdef __KERNEL__
 
 #define MAJOR_VERSION 0         /* driver major version */
-#define MINOR_VERSION 9         /* driver minor version */
-#define RELEASE_VERSION 5       /* release version */
+#define MINOR_VERSION 10        /* driver minor version */
+#define RELEASE_VERSION 0       /* release version */
 
 #define ZORAN_NAME    "ZORAN"   /* name of the device */