Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (213 commits)
  V4L/DVB (12720): em28xx-cards: Add vendor/product id for Kworld DVD Maker 2
  V4L/DVB (12713): em28xx: Cleanups at ir_i2c handler
  V4L/DVB (12712): em28xx: properly load ir-kbd-i2c when needed
  V4L/DVB (12701): saa7134: ir-kbd-i2c init data needs a persistent object
  V4L/DVB (12699): cx18: ir-kbd-i2c initialization data should point to a persistent object
  V4L/DVB (12698): em28xx: ir-kbd-i2c init data needs a persistent object
  V4L/DVB (12707): gspca - sn9c20x: Add SXGA support to MT9M111
  V4L/DVB (12706): gspca - sn9c20x: disable exposure/gain controls for MT9M111 sensors.
  V4L/DVB (12705): gspca - sn9c20x: Add SXGA support to SOI968
  V4L/DVB (12703): gspca - sn9c20x: Reduces size of object
  V4L/DVB (12704): gspca - sn9c20x: Fix exposure on SOI968 sensors
  V4L/DVB (12696): gspca - sonixj / sn9c102: Two drivers for 0c45:60fc and 0c45:613e.
  V4L/DVB (12695): gspca - vc032x: Do the LED work with the sensor hv7131r.
  V4L/DVB (12694): gspca - vc032x: Change the start exchanges of the sensor hv7131r.
  V4L/DVB (12693): gspca - sunplus: The brightness is signed.
  V4L/DVB (12692): gspca - sunplus: Optimize code.
  V4L/DVB (12691): gspca - sonixj: Don't use mdelay().
  V4L/DVB (12690): gspca - pac7311: Webcam 06f8:3009 added.
  V4L/DVB (12686): dvb-core: check supported QAM modulations
  V4L/DVB (12685): dvb-core: check fe->ops.set_frontend return value
  ...

1 files changed, 164 insertions, 0 deletions

diff --git a/include/linux/usb/video.h b/include/linux/usb/video.h
new file mode 100644
index 000000000000..be436d9ee479
--- /dev/null
+++ b/include/linux/usb/video.h
@@ -0,0 +1,164 @@
+/*
+ * USB Video Class definitions.
+ *
+ * Copyright (C) 2009 Laurent Pinchart <laurent.pinchart@skynet.be>
+ *
+ * This file holds USB constants and structures defined by the USB Device
+ * Class Definition for Video Devices. Unless otherwise stated, comments
+ * below reference relevant sections of the USB Video Class 1.1 specification
+ * available at
+ *
+ * http://www.usb.org/developers/devclass_docs/USB_Video_Class_1_1.zip
+ */
+
+#ifndef __LINUX_USB_VIDEO_H
+#define __LINUX_USB_VIDEO_H
+
+#include <linux/types.h>
+
+/* --------------------------------------------------------------------------
+ * UVC constants
+ */
+
+/* A.2. Video Interface Subclass Codes */
+#define UVC_SC_UNDEFINED                                0x00
+#define UVC_SC_VIDEOCONTROL                             0x01
+#define UVC_SC_VIDEOSTREAMING                           0x02
+#define UVC_SC_VIDEO_INTERFACE_COLLECTION               0x03
+
+/* A.3. Video Interface Protocol Codes */
+#define UVC_PC_PROTOCOL_UNDEFINED                       0x00
+
+/* A.5. Video Class-Specific VC Interface Descriptor Subtypes */
+#define UVC_VC_DESCRIPTOR_UNDEFINED                     0x00
+#define UVC_VC_HEADER                                   0x01
+#define UVC_VC_INPUT_TERMINAL                           0x02
+#define UVC_VC_OUTPUT_TERMINAL                          0x03
+#define UVC_VC_SELECTOR_UNIT                            0x04
+#define UVC_VC_PROCESSING_UNIT                          0x05
+#define UVC_VC_EXTENSION_UNIT                           0x06
+
+/* A.6. Video Class-Specific VS Interface Descriptor Subtypes */
+#define UVC_VS_UNDEFINED                                0x00
+#define UVC_VS_INPUT_HEADER                             0x01
+#define UVC_VS_OUTPUT_HEADER                            0x02
+#define UVC_VS_STILL_IMAGE_FRAME                        0x03
+#define UVC_VS_FORMAT_UNCOMPRESSED                      0x04
+#define UVC_VS_FRAME_UNCOMPRESSED                       0x05
+#define UVC_VS_FORMAT_MJPEG                             0x06
+#define UVC_VS_FRAME_MJPEG                              0x07
+#define UVC_VS_FORMAT_MPEG2TS                           0x0a
+#define UVC_VS_FORMAT_DV                                0x0c
+#define UVC_VS_COLORFORMAT                              0x0d
+#define UVC_VS_FORMAT_FRAME_BASED                       0x10
+#define UVC_VS_FRAME_FRAME_BASED                        0x11
+#define UVC_VS_FORMAT_STREAM_BASED                      0x12
+
+/* A.7. Video Class-Specific Endpoint Descriptor Subtypes */
+#define UVC_EP_UNDEFINED                                0x00
+#define UVC_EP_GENERAL                                  0x01
+#define UVC_EP_ENDPOINT                                 0x02
+#define UVC_EP_INTERRUPT                                0x03
+
+/* A.8. Video Class-Specific Request Codes */
+#define UVC_RC_UNDEFINED                                0x00
+#define UVC_SET_CUR                                     0x01
+#define UVC_GET_CUR                                     0x81
+#define UVC_GET_MIN                                     0x82
+#define UVC_GET_MAX                                     0x83
+#define UVC_GET_RES                                     0x84
+#define UVC_GET_LEN                                     0x85
+#define UVC_GET_INFO                                    0x86
+#define UVC_GET_DEF                                     0x87
+
+/* A.9.1. VideoControl Interface Control Selectors */
+#define UVC_VC_CONTROL_UNDEFINED                        0x00
+#define UVC_VC_VIDEO_POWER_MODE_CONTROL                 0x01
+#define UVC_VC_REQUEST_ERROR_CODE_CONTROL               0x02
+
+/* A.9.2. Terminal Control Selectors */
+#define UVC_TE_CONTROL_UNDEFINED                        0x00
+
+/* A.9.3. Selector Unit Control Selectors */
+#define UVC_SU_CONTROL_UNDEFINED                        0x00
+#define UVC_SU_INPUT_SELECT_CONTROL                     0x01
+
+/* A.9.4. Camera Terminal Control Selectors */
+#define UVC_CT_CONTROL_UNDEFINED                        0x00
+#define UVC_CT_SCANNING_MODE_CONTROL                    0x01
+#define UVC_CT_AE_MODE_CONTROL                          0x02
+#define UVC_CT_AE_PRIORITY_CONTROL                      0x03
+#define UVC_CT_EXPOSURE_TIME_ABSOLUTE_CONTROL           0x04
+#define UVC_CT_EXPOSURE_TIME_RELATIVE_CONTROL           0x05
+#define UVC_CT_FOCUS_ABSOLUTE_CONTROL                   0x06
+#define UVC_CT_FOCUS_RELATIVE_CONTROL                   0x07
+#define UVC_CT_FOCUS_AUTO_CONTROL                       0x08
+#define UVC_CT_IRIS_ABSOLUTE_CONTROL                    0x09
+#define UVC_CT_IRIS_RELATIVE_CONTROL                    0x0a
+#define UVC_CT_ZOOM_ABSOLUTE_CONTROL                    0x0b
+#define UVC_CT_ZOOM_RELATIVE_CONTROL                    0x0c
+#define UVC_CT_PANTILT_ABSOLUTE_CONTROL                 0x0d
+#define UVC_CT_PANTILT_RELATIVE_CONTROL                 0x0e
+#define UVC_CT_ROLL_ABSOLUTE_CONTROL                    0x0f
+#define UVC_CT_ROLL_RELATIVE_CONTROL                    0x10
+#define UVC_CT_PRIVACY_CONTROL                          0x11
+
+/* A.9.5. Processing Unit Control Selectors */
+#define UVC_PU_CONTROL_UNDEFINED                        0x00
+#define UVC_PU_BACKLIGHT_COMPENSATION_CONTROL           0x01
+#define UVC_PU_BRIGHTNESS_CONTROL                       0x02
+#define UVC_PU_CONTRAST_CONTROL                         0x03
+#define UVC_PU_GAIN_CONTROL                             0x04
+#define UVC_PU_POWER_LINE_FREQUENCY_CONTROL             0x05
+#define UVC_PU_HUE_CONTROL                              0x06
+#define UVC_PU_SATURATION_CONTROL                       0x07
+#define UVC_PU_SHARPNESS_CONTROL                        0x08
+#define UVC_PU_GAMMA_CONTROL                            0x09
+#define UVC_PU_WHITE_BALANCE_TEMPERATURE_CONTROL        0x0a
+#define UVC_PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL   0x0b
+#define UVC_PU_WHITE_BALANCE_COMPONENT_CONTROL          0x0c
+#define UVC_PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL     0x0d
+#define UVC_PU_DIGITAL_MULTIPLIER_CONTROL               0x0e
+#define UVC_PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL         0x0f
+#define UVC_PU_HUE_AUTO_CONTROL                         0x10
+#define UVC_PU_ANALOG_VIDEO_STANDARD_CONTROL            0x11
+#define UVC_PU_ANALOG_LOCK_STATUS_CONTROL               0x12
+
+/* A.9.7. VideoStreaming Interface Control Selectors */
+#define UVC_VS_CONTROL_UNDEFINED                        0x00
+#define UVC_VS_PROBE_CONTROL                            0x01
+#define UVC_VS_COMMIT_CONTROL                           0x02
+#define UVC_VS_STILL_PROBE_CONTROL                      0x03
+#define UVC_VS_STILL_COMMIT_CONTROL                     0x04
+#define UVC_VS_STILL_IMAGE_TRIGGER_CONTROL              0x05
+#define UVC_VS_STREAM_ERROR_CODE_CONTROL                0x06
+#define UVC_VS_GENERATE_KEY_FRAME_CONTROL               0x07
+#define UVC_VS_UPDATE_FRAME_SEGMENT_CONTROL             0x08
+#define UVC_VS_SYNC_DELAY_CONTROL                       0x09
+
+/* B.1. USB Terminal Types */
+#define UVC_TT_VENDOR_SPECIFIC                          0x0100
+#define UVC_TT_STREAMING                                0x0101
+
+/* B.2. Input Terminal Types */
+#define UVC_ITT_VENDOR_SPECIFIC                         0x0200
+#define UVC_ITT_CAMERA                                  0x0201
+#define UVC_ITT_MEDIA_TRANSPORT_INPUT                   0x0202
+
+/* B.3. Output Terminal Types */
+#define UVC_OTT_VENDOR_SPECIFIC                         0x0300
+#define UVC_OTT_DISPLAY                                 0x0301
+#define UVC_OTT_MEDIA_TRANSPORT_OUTPUT                  0x0302
+
+/* B.4. External Terminal Types */
+#define UVC_EXTERNAL_VENDOR_SPECIFIC                    0x0400
+#define UVC_COMPOSITE_CONNECTOR                         0x0401
+#define UVC_SVIDEO_CONNECTOR                            0x0402
+#define UVC_COMPONENT_CONNECTOR                         0x0403
+
+/* 2.4.2.2. Status Packet Type */
+#define UVC_STATUS_TYPE_CONTROL                         1
+#define UVC_STATUS_TYPE_STREAMING                       2
+
+#endif /* __LINUX_USB_VIDEO_H */
+