Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / drivers / media / video / usbvision / usbvision-cards.c

diff --git a/drivers/media/video/usbvision/usbvision-cards.c b/drivers/media/video/usbvision/usbvision-cards.c
index 68b998b..8f52661 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-cards.c
+++ b/drivers/media/video/usbvision/usbvision-cards.c
@@ -1025,6 +1025,34 @@ struct usbvision_device_data_st  usbvision_device_data[] = {
                .y_offset       = -1,
                .model_string   = "Hauppauge WinTv-USB",
        },
+       [MICROCAM_NTSC] = {
+               .interface      = -1,
+               .codec          = CODEC_WEBCAM,
+               .video_channels = 1,
+               .video_norm     = V4L2_STD_NTSC,
+               .audio_channels = 0,
+               .radio          = 0,
+               .vbi            = 0,
+               .tuner          = 0,
+               .tuner_type     = 0,
+               .x_offset       = 71,
+               .y_offset       = 15,
+               .model_string   = "Nogatech USB MicroCam NTSC (NV3000N)",
+       },
+       [MICROCAM_PAL] = {
+               .interface      = -1,
+               .codec          = CODEC_WEBCAM,
+               .video_channels = 1,
+               .video_norm     = V4L2_STD_PAL,
+               .audio_channels = 0,
+               .radio          = 0,
+               .vbi            = 0,
+               .tuner          = 0,
+               .tuner_type     = 0,
+               .x_offset       = 71,
+               .y_offset       = 18,
+               .model_string   = "Nogatech USB MicroCam PAL (NV3001P)",
+       },
 };
 const int usbvision_device_data_size = ARRAY_SIZE(usbvision_device_data);
 
@@ -1042,6 +1070,8 @@ struct usb_device_id usbvision_table[] = {
        { USB_DEVICE(0x0573, 0x2d00), .driver_info = HPG_WINTV_LIVE_PAL_BG },
        { USB_DEVICE(0x0573, 0x2d01), .driver_info = HPG_WINTV_LIVE_PRO_NTSC_MN },
        { USB_DEVICE(0x0573, 0x2101), .driver_info = ZORAN_PMD_NOGATECH },
+       { USB_DEVICE(0x0573, 0x3000), .driver_info = MICROCAM_NTSC },
+       { USB_DEVICE(0x0573, 0x3001), .driver_info = MICROCAM_PAL },
        { USB_DEVICE(0x0573, 0x4100), .driver_info = NOGATECH_USB_TV_NTSC_FM },
        { USB_DEVICE(0x0573, 0x4110), .driver_info = PNY_USB_TV_NTSC_FM },
        { USB_DEVICE(0x0573, 0x4450), .driver_info = PV_PLAYTV_USB_PRO_PAL_FM },
@@ -1088,8 +1118,7 @@ struct usb_device_id usbvision_table[] = {
        { USB_DEVICE(0x2304, 0x0110), .driver_info = PINNA_PCTV_USB_PAL_FM },
        { USB_DEVICE(0x2304, 0x0111), .driver_info = MIRO_PCTV_USB },
        { USB_DEVICE(0x2304, 0x0112), .driver_info = PINNA_PCTV_USB_NTSC_FM },
-       { USB_DEVICE(0x2304, 0x0113),
-         .driver_info = PINNA_PCTV_USB_NTSC_FM_V3 },
+       { USB_DEVICE(0x2304, 0x0113), .driver_info = PINNA_PCTV_USB_NTSC_FM_V3 },
        { USB_DEVICE(0x2304, 0x0210), .driver_info = PINNA_PCTV_USB_PAL_FM_V2 },
        { USB_DEVICE(0x2304, 0x0212), .driver_info = PINNA_PCTV_USB_NTSC_FM_V2 },
        { USB_DEVICE(0x2304, 0x0214), .driver_info = PINNA_PCTV_USB_PAL_FM_V3 },