1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h
index c759d00d7014..7e6cc8e09cc4 100644
--- a/drivers/media/video/usbvision/usbvision.h
+++ b/drivers/media/video/usbvision/usbvision.h
@@ -221,6 +221,8 @@ enum {
 
 #define I2C_USB_ADAP_MAX        16
 
+#define USBVISION_NORMS (V4L2_STD_PAL | V4L2_STD_NTSC | V4L2_STD_SECAM | V4L2_STD_PAL_M)
+
 /* ----------------------------------------------------------------- */
 /* usbvision video structures                                        */
 /* ----------------------------------------------------------------- */
@@ -301,14 +303,6 @@ struct usbvision_frame_header {
         __u16 frameHeight;                              /* 10 - 11 after endian correction*/
 };
 
-/* tvnorms */
-struct usbvision_tvnorm {
-        char *name;
-        v4l2_std_id id;
-        /* mode for saa7113h */
-        int mode;
-};
-
 struct usbvision_frame {
         char *data;                                     /* Frame buffer */
         struct usbvision_frame_header isocHeader;       /* Header from stream */
@@ -441,7 +435,7 @@ struct usb_usbvision {
 
         struct v4l2_capability vcap;                                    /* Video capabilities */
         unsigned int ctl_input;                                         /* selected input */
-        struct usbvision_tvnorm *tvnorm;                                /* selected tv norm */
+        v4l2_std_id tvnormId;                                           /* selected tv norm */
         unsigned char video_endp;                                       /* 0x82 for USBVISION devices based */
 
         // Decompression stuff: