diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 14:04:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 14:04:25 -0700 |
| commit | 8871b201da6e443b7ab2967050e3064360d0604f (patch) | |
| tree | 06b3a17b24d6e83339aa1ac9f8dd4acff8457a43 /include | |
| parent | 085ff82c9c615d502d1e6754879d8d4ff590d143 (diff) | |
| parent | 0a6843483c256c859cd9542361812a29403f0fb5 (diff) | |
| download | linux-3.10-8871b201da6e443b7ab2967050e3064360d0604f.tar.gz linux-3.10-8871b201da6e443b7ab2967050e3064360d0604f.tar.bz2 linux-3.10-8871b201da6e443b7ab2967050e3064360d0604f.zip | |
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: (25 commits)
V4L/DVB (12206): get_dvb_firmware: Correct errors in MPC718 firmware extraction logic
V4L/DVB (12203): radio-si470x: fix lock imbalance
V4L/DVB (12202): em28xx, fix lock imbalance
V4L/DVB (12172): em28xx: Add autodetection code for Silvercrest 1.3 mpix
V4L/DVB (12171): em28xx: fix webcam usage with different output formats
V4L/DVB (12169): em28xx-video: fix VIDIOC_G_FMT and VIDIOC_ENUMFMT with webcams
V4L/DVB (12156): em28xx: Fix tuning for Terratec Cinergy T XS USB (zl10353 version)
V4L/DVB (12139): em28xx: add other video formats
V4L/DVB (12138): em28xx: add support for Silvercrest Webcam
V4L/DVB (12174): mt9v011: let's stick with datasheet values where it works
V4L/DVB (12173): mt9v011: properly calculate image resolution registers
V4L/DVB (12137): mt9v011: CodingStyle fixes
V4L/DVB (12136): mt9v011: Some fixes at the register initialization table
V4L/DVB (12135): Add a driver for mt9v011 sensor
V4L/DVB (12166): cx23885: add FIXME comment above set_frontend override
V4L/DVB (12165): cx23885: override set_frontend to allow rf input path switching on the HVR1275
V4L/DVB (12148): move V4L2_PIX_FMT_SGRBG8 to the proper place
V4L/DVB (12182): cx18: Add DVB-T support for Yuan MPC-718 cards with an MT352 or ZL10353
V4L/DVB (12181): get_dvb_firmware: Add Yuan MPC718 MT352 DVB-T "firmware" extraction
V4L/DVB (12180): cx18: Update Yuan MPC-718 card entry with better information and guesses
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/videodev2.h | 2 | ||||
| -rw-r--r-- | include/media/v4l2-chip-ident.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 8a025d51090..95846d98801 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -318,6 +318,8 @@ struct v4l2_pix_format { /* see http://www.siliconimaging.com/RGB%20Bayer.htm */ #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */ #define V4L2_PIX_FMT_SGBRG8 v4l2_fourcc('G', 'B', 'R', 'G') /* 8 GBGB.. RGRG.. */ +#define V4L2_PIX_FMT_SGRBG8 v4l2_fourcc('G', 'R', 'B', 'G') /* 8 GRGR.. BGBG.. */ + /* * 10bit raw bayer, expanded to 16 bits * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb... diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h index 4d7e2272c42..11a4a2d3e36 100644 --- a/include/media/v4l2-chip-ident.h +++ b/include/media/v4l2-chip-ident.h @@ -155,6 +155,9 @@ enum { /* module cafe_ccic, just ident 8801 */ V4L2_IDENT_CAFE = 8801, + /* module mt9v011, just ident 8243 */ + V4L2_IDENT_MT9V011 = 8243, + /* module tw9910: just ident 9910 */ V4L2_IDENT_TW9910 = 9910, |