V4L/DVB (8509): pvrusb2: fix device descriptions for HVR-1900 & HVR-1950

[safe/jmp/linux-2.6] / drivers / media / video / ov511.h

diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h
index bce9b36..baded12 100644 (file)
--- a/drivers/media/video/ov511.h
+++ b/drivers/media/video/ov511.h
@@ -3,7 +3,8 @@
 
 #include <asm/uaccess.h>
 #include <linux/videodev.h>
-#include <linux/smp_lock.h>
+#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 #include <linux/usb.h>
 #include <linux/mutex.h>
 
@@ -12,7 +13,7 @@
 #ifdef OV511_DEBUG
        #define PDEBUG(level, fmt, args...) \
                if (debug >= (level)) info("[%s:%d] " fmt, \
-               __FUNCTION__, __LINE__ , ## args)
+               __func__, __LINE__ , ## args)
 #else
        #define PDEBUG(level, fmt, args...) do {} while(0)
 #endif
@@ -130,7 +131,7 @@
 #define R511_COMP_QVY          0x76
 #define R511_COMP_QVUV         0x77
 #define R511_COMP_EN           0x78
-#define R511_COMP_LUT_EN       0x79            
+#define R511_COMP_LUT_EN       0x79
 #define R511_COMP_LUT_BEGIN    0x80
 
 /* --------------------------------- */
@@ -459,14 +460,14 @@ struct usb_ov511 {
        int subh;               /* Pix Array subcapture height */
 
        int curframe;           /* Current receiving sbuf */
-       struct ov511_frame frame[OV511_NUMFRAMES];      
+       struct ov511_frame frame[OV511_NUMFRAMES];
 
        struct ov511_sbuf sbuf[OV511_NUMSBUF];
 
        wait_queue_head_t wq;   /* Processes waiting */
 
        int snap_enabled;       /* Snapshot mode enabled */
-       
+
        int bridge;             /* Type of bridge (BRG_*) */
        int bclass;             /* Class of bridge (BCL_*) */
        int sensor;             /* Type of image sensor chip (SEN_*) */
@@ -512,7 +513,7 @@ struct symbolic_list {
 /* Returns the name of the matching element in the symbolic_list array. The
  * end of the list must be marked with an element that has a NULL name.
  */
-static inline char * 
+static inline char *
 symbolic(struct symbolic_list list[], int num)
 {
        int i;