Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (244 commits)
  V4L/DVB (4210b): git-dvb: tea575x-tuner build fix
  V4L/DVB (4210a): git-dvb versus matroxfb
  V4L/DVB (4209): Added some BTTV PCI IDs for newer boards
  Fixes some sync issues between V4L/DVB development and GIT
  V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id
  V4L/DVB (4205): Merge tda9887 module into tuner.
  V4L/DVB (4203): Explicitly set the enum values.
  V4L/DVB (4202): allow selecting CX2341x port mode
  V4L/DVB (4200): Disable bitrate_mode when encoding mpeg-1.
  V4L/DVB (4199): Add cx2341x-specific control array to cx2341x.c
  V4L/DVB (4198): Avoid newer usages of obsoleted experimental MPEGCOMP API
  V4L/DVB (4197): Port new MPEG API to saa7134-empress with saa6752hs
  V4L/DVB (4196): Port cx88-blackbird to the new MPEG API.
  V4L/DVB (4193): Update cx2341x fw encoding API doc.
  V4L/DVB (4192): Use control helpers for saa7115, cx25840, msp3400.
  V4L/DVB (4191): Add CX2341X MPEG encoder module.
  V4L/DVB (4190): Add helper functions for control processing to v4l2-common.
  V4L/DVB (4189): Add videodev support for VIDIOC_S/G/TRY_EXT_CTRLS.
  V4L/DVB (4188): Add new MPEG control/ioctl definitions to videodev2.h
  V4L/DVB (4186): Add support for the DNTV Live! mini DVB-T card.
  ...

1 files changed, 16 insertions, 15 deletions

diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 7bf1a4264891..59b86a6b4b0e 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -1,7 +1,7 @@
 /* zoltrix radio plus driver for Linux radio support
  * (c) 1998 C. van Schaik <carl@leg.uct.ac.za>
  *
- * BUGS  
+ * BUGS
  *  Due to the inconsistency in reading from the signal flags
  *  it is difficult to get an accurate tuned signal.
  *
@@ -14,7 +14,7 @@
  *
  * 1999-05-06 - (C. van Schaik)
  *            - Make signal strength and stereo scans
- *              kinder to cpu while in delay
+ *              kinder to cpu while in delay
  * 1999-01-05 - (C. van Schaik)
  *            - Changed tuning to 1/160Mhz accuracy
  *            - Added stereo support
@@ -33,6 +33,7 @@
 #include <asm/io.h>             /* outb, outb_p                   */
 #include <asm/uaccess.h>        /* copy to/from user              */
 #include <linux/videodev.h>     /* kernel radio structs           */
+#include <media/v4l2-common.h>
 #include <linux/config.h>       /* CONFIG_RADIO_ZOLTRIX_PORT      */
 
 #ifndef CONFIG_RADIO_ZOLTRIX_PORT
@@ -105,7 +106,7 @@ static int zol_setfreq(struct zol_device *dev, unsigned long freq)
         i = 45;
 
         mutex_lock(&dev->lock);
-        
+
         outb(0, io);
         outb(0, io);
         inb(io + 3);            /* Zoltrix needs to be read to confirm */
@@ -139,8 +140,8 @@ static int zol_setfreq(struct zol_device *dev, unsigned long freq)
         udelay(1000);
         inb(io+2);
 
-        udelay(1000);
-        
+        udelay(1000);
+
         if (dev->muted)
         {
                 outb(0, io);
@@ -148,12 +149,12 @@ static int zol_setfreq(struct zol_device *dev, unsigned long freq)
                 inb(io + 3);
                 udelay(1000);
         }
-        
+
         mutex_unlock(&dev->lock);
-        
+
         if(!dev->muted)
         {
-                zol_setvol(dev, dev->curvol);
+                zol_setvol(dev, dev->curvol);
         }
         return 0;
 }
@@ -174,14 +175,14 @@ static int zol_getsigstr(struct zol_device *dev)
         b = inb(io);
 
         mutex_unlock(&dev->lock);
-        
+
         if (a != b)
                 return (0);
 
-        if ((a == 0xcf) || (a == 0xdf)  /* I found this out by playing */
+        if ((a == 0xcf) || (a == 0xdf)  /* I found this out by playing */
                 || (a == 0xef))       /* with a binary scanner on the card io */
                 return (1);
-        return (0);
+        return (0);
 }
 
 static int zol_is_stereo (struct zol_device *dev)
@@ -189,7 +190,7 @@ static int zol_is_stereo (struct zol_device *dev)
         int x1, x2;
 
         mutex_lock(&dev->lock);
-        
+
         outb(0x00, io);
         outb(dev->curvol, io);
         msleep(20);
@@ -199,7 +200,7 @@ static int zol_is_stereo (struct zol_device *dev)
         x2 = inb(io);
 
         mutex_unlock(&dev->lock);
-        
+
         if ((x1 == x2) && (x1 == 0xcf))
                 return 1;
         return 0;
@@ -226,7 +227,7 @@ static int zol_do_ioctl(struct inode *inode, struct file *file,
         case VIDIOCGTUNER:
                 {
                         struct video_tuner *v = arg;
-                        if (v->tuner)   
+                        if (v->tuner)
                                 return -EINVAL;
                         strcpy(v->name, "FM");
                         v->rangelow = (int) (88.0 * 16000);
@@ -351,7 +352,7 @@ static int __init zoltrix_init(void)
         printk(KERN_INFO "Zoltrix Radio Plus card driver.\n");
 
         mutex_init(&zoltrix_unit.lock);
-        
+
         /* mute card - prevents noisy bootups */
 
         /* this ensures that the volume is all the way down  */