diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 00:12:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 00:12:49 -0400 |
| commit | df462b3dbeeaae7141f1b63cbfcc1e1bae6a85fc (patch) | |
| tree | bca52fce066159f136d75c69e79016422212cb1d /drivers/media/video/em28xx/em28xx.h | |
| parent | 343800e7d20944aead238c2c6e3f7789f8b6587c (diff) | |
| parent | cf25220677b3f10468a74278130fe224f73632a6 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (247 commits)
[media] gspca - sunplus: Fix some warnings and simplify code
[media] gspca: Fix some warnings tied to 'no debug'
[media] gspca: Unset debug by default
[media] gspca - cpia1: Remove a bad conditional compilation instruction
[media] gspca - main: Remove USB traces
[media] gspca - main: Version change to 2.13
[media] gspca - stk014 / t613: Accept the index 0 in querymenu
[media] gspca - kinect: Remove __devinitdata
[media] gspca - cpia1: Fix some warnings
[media] video/Kconfig: Fix mis-classified devices
[media] support for medion dvb stick 1660:1921
[media] tm6000: fix uninitialized field, change prink to dprintk
[media] cx231xx: Add support for Iconbit U100
[media] saa7134 add new TV cards
[media] Use a more consistent value for RC repeat period
[media] cx18: Move spinlock and vb_type initialisation into stream_init
[media] tm6000: remove tm6010 sif audio start and stop
[media] tm6000: remove unused exports
[media] tm6000: add pts logging
[media] tm6000: change from ioctl to unlocked_ioctl
...
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h index 6f2795a3d4b7..3cca33122450 100644 --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h | |||
| @@ -97,7 +97,7 @@ | |||
| 97 | #define EM2881_BOARD_PINNACLE_HYBRID_PRO 53 | 97 | #define EM2881_BOARD_PINNACLE_HYBRID_PRO 53 |
| 98 | #define EM2882_BOARD_KWORLD_VS_DVBT 54 | 98 | #define EM2882_BOARD_KWORLD_VS_DVBT 54 |
| 99 | #define EM2882_BOARD_TERRATEC_HYBRID_XS 55 | 99 | #define EM2882_BOARD_TERRATEC_HYBRID_XS 55 |
| 100 | #define EM2882_BOARD_PINNACLE_HYBRID_PRO 56 | 100 | #define EM2882_BOARD_PINNACLE_HYBRID_PRO_330E 56 |
| 101 | #define EM2883_BOARD_KWORLD_HYBRID_330U 57 | 101 | #define EM2883_BOARD_KWORLD_HYBRID_330U 57 |
| 102 | #define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58 | 102 | #define EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU 58 |
| 103 | #define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60 | 103 | #define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_850 60 |
| @@ -118,6 +118,7 @@ | |||
| 118 | #define EM2882_BOARD_DIKOM_DK300 75 | 118 | #define EM2882_BOARD_DIKOM_DK300 75 |
| 119 | #define EM2870_BOARD_KWORLD_A340 76 | 119 | #define EM2870_BOARD_KWORLD_A340 76 |
| 120 | #define EM2874_LEADERSHIP_ISDBT 77 | 120 | #define EM2874_LEADERSHIP_ISDBT 77 |
| 121 | #define EM28174_BOARD_PCTV_290E 78 | ||
| 121 | 122 | ||
| 122 | 123 | ||
| 123 | /* Limits minimum and default number of buffers */ | 124 | /* Limits minimum and default number of buffers */ |