diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 17:03:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 17:03:59 -0400 |
| commit | cf2fa66055d718ae13e62451bb546505f63906a2 (patch) | |
| tree | e206d3f04e74a34e9aa88d21af6c26eea21d4121 /drivers/media/dvb/dvb-usb/af9005-script.h | |
| parent | 4501a466f28788485604ee42641d7a5fe7258d16 (diff) | |
| parent | 57f51dbc45f65f7ee1e8c8f77200bb8000e3e271 (diff) | |
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: (313 commits)
V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
V4L/DVB (9179): S2API: frontend.h cleanup
V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
V4L/DVB: v4l2-dev: remove duplicated #include
...
Diffstat (limited to 'drivers/media/dvb/dvb-usb/af9005-script.h')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/af9005-script.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9005-script.h b/drivers/media/dvb/dvb-usb/af9005-script.h index 6eeaae51b1ca..4d69045426dd 100644 --- a/drivers/media/dvb/dvb-usb/af9005-script.h +++ b/drivers/media/dvb/dvb-usb/af9005-script.h | |||
| @@ -14,7 +14,7 @@ typedef struct { | |||
| 14 | u8 val; | 14 | u8 val; |
| 15 | } RegDesc; | 15 | } RegDesc; |
| 16 | 16 | ||
| 17 | RegDesc script[] = { | 17 | static RegDesc script[] = { |
| 18 | {0xa180, 0x0, 0x8, 0xa}, | 18 | {0xa180, 0x0, 0x8, 0xa}, |
| 19 | {0xa181, 0x0, 0x8, 0xd7}, | 19 | {0xa181, 0x0, 0x8, 0xd7}, |
| 20 | {0xa182, 0x0, 0x8, 0xa3}, | 20 | {0xa182, 0x0, 0x8, 0xa3}, |