diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 14:21:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 14:21:08 -0400 |
| commit | c328d54cd4ad120d76284e46dcca6c6cf996154a (patch) | |
| tree | 104c023be66faa5fce6e0a56c0a6d13c62fd21e5 /drivers/media/video/zr36060.c | |
| parent | 346ad4b7fe392571f19314f153db9151dbc1d82b (diff) | |
| parent | b0166ab3a6ae6d7af8d9a21a7836154963c69a11 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (452 commits)
V4L/DVB (7731): tuner-xc2028: fix signal strength calculus
V4L/DVB (7730): tuner-xc2028: Fix SCODE load for MTS firmwares
V4L/DVB (7729): Fix VIDIOCGAP corruption in ivtv
V4L/DVB (7728): tea5761: bugzilla #10462: tea5761 autodetection code were broken
V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800
V4L/DVB (7725): cx23885: Add generic cx23417 hardware encoder support
V4L/DVB (7723): pvrusb2: Clean up input selection list generation in V4L interface
V4L/DVB (7722): pvrusb2: Implement FM radio support for Gotview USB2.0 DVD 2
V4L/DVB (7721): pvrusb2: Restructure cx23416 firmware loading to have a common exit point
V4L/DVB (7720): pvrusb2: Fix bad error code on cx23416 firmware load failure
V4L/DVB (7719): pvrusb2: Implement input selection enforcement
V4L/DVB (7718): pvrusb2-dvb: update Kbuild selections
V4L/DVB (7717): pvrusb2-dvb: add DVB-T support for Hauppauge pvrusb2 model 73xxx
V4L/DVB (7716): pvrusb2: clean up global functions
V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__
V4L/DVB (7714): pvrusb2: Fix hang on module removal
V4L/DVB (7713): pvrusb2: Implement cleaner DVB kernel thread shutdown
V4L/DVB (7712): pvrusb2: Close connect/disconnect race
V4L/DVB (7711): pvrusb2: Fix race on module unload
V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk for onair devices
...
Diffstat (limited to 'drivers/media/video/zr36060.c')
| -rw-r--r-- | drivers/media/video/zr36060.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c index 7849b65969d0..8e74054d5ef1 100644 --- a/drivers/media/video/zr36060.c +++ b/drivers/media/video/zr36060.c | |||
| @@ -52,14 +52,14 @@ | |||
| 52 | #define MAX_CODECS 20 | 52 | #define MAX_CODECS 20 |
| 53 | 53 | ||
| 54 | /* amount of chips attached via this driver */ | 54 | /* amount of chips attached via this driver */ |
| 55 | static int zr36060_codecs = 0; | 55 | static int zr36060_codecs; |
| 56 | 56 | ||
| 57 | static int low_bitrate = 0; | 57 | static int low_bitrate; |
| 58 | module_param(low_bitrate, bool, 0); | 58 | module_param(low_bitrate, bool, 0); |
| 59 | MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate"); | 59 | MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate"); |
| 60 | 60 | ||
| 61 | /* debugging is available via module parameter */ | 61 | /* debugging is available via module parameter */ |
| 62 | static int debug = 0; | 62 | static int debug; |
| 63 | module_param(debug, int, 0); | 63 | module_param(debug, int, 0); |
| 64 | MODULE_PARM_DESC(debug, "Debug level (0-4)"); | 64 | MODULE_PARM_DESC(debug, "Debug level (0-4)"); |
| 65 | 65 | ||