diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:37:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:37:36 -0500 |
| commit | 368d17e068f691dba5a4f122c271db5ec9b2ebd6 (patch) | |
| tree | 69954cea09e5efd4ad1b8268be0e1733a13b4fae /drivers/media/video/saa7196.h | |
| parent | a9312fb839e90668d05a90024f3a7e7ff646a4a3 (diff) | |
| parent | 22fe087f0139e2f5cbe004f24f84cb1c08b4711e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (33 commits)
V4L/DVB (3604): V4l printk fix
V4L/DVB (3599c): Whitespace cleanups under Documentation/video4linux
V4L/DVB (3599b): Whitespace cleanups under drivers/media
V4L/DVB (3599a): Move drivers/usb/media to drivers/media/video
V4L/DVB (3599): Implement new routing commands for wm8775 and cs53l32a.
V4L/DVB (3598): Add bit algorithm adapter for the Conexant CX2341X boards.
V4L/DVB (3597): Vivi: fix warning: implicit declaration of function 'in_interrupt'
V4L/DVB (3588): Remove VIDIOC_G/S_AUDOUT from msp3400
V4L/DVB (3587): Always wake thread after routing change.
V4L/DVB (3584): Implement V4L2_TUNER_MODE_LANG1_LANG2 audio mode
V4L/DVB (3582): Implement correct msp3400 input/output routing
V4L/DVB (3581): Add new media/msp3400.h header containing the routing macros
V4L/DVB (3580): Last round of msp3400 cleanups before adding routing commands
V4L/DVB (3579): Move msp_modus to msp3400-kthreads, add JP and KR std detection
V4L/DVB (3578): Make scart definitions easier to handle
V4L/DVB (3577): Cleanup audio input handling
V4L/DVB (3575): Cxusb: fix i2c debug messages for bluebird devices
V4L/DVB (3574): Cxusb: fix debug messages
V4L/DVB (3573): Cxusb: remove FIXME: comment in bluebird_patch_dvico_firmware_download
V4L/DVB (3572): Cxusb: conditionalize gpio write for the medion box
...
Diffstat (limited to 'drivers/media/video/saa7196.h')
| -rw-r--r-- | drivers/media/video/saa7196.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7196.h b/drivers/media/video/saa7196.h index f92f21cfbcac..cd4b6354a7b3 100644 --- a/drivers/media/video/saa7196.h +++ b/drivers/media/video/saa7196.h | |||
| @@ -2,14 +2,14 @@ | |||
| 2 | Definitions for the Philips SAA7196 digital video decoder, | 2 | Definitions for the Philips SAA7196 digital video decoder, |
| 3 | scaler, and clock generator circuit (DESCpro), as used in | 3 | scaler, and clock generator circuit (DESCpro), as used in |
| 4 | the PlanB video input of the Powermac 7x00/8x00 series. | 4 | the PlanB video input of the Powermac 7x00/8x00 series. |
| 5 | 5 | ||
| 6 | Copyright (C) 1998 Michel Lanners (mlan@cpu.lu) | 6 | Copyright (C) 1998 Michel Lanners (mlan@cpu.lu) |
| 7 | 7 | ||
| 8 | The register defines are shamelessly copied from the meteor | 8 | The register defines are shamelessly copied from the meteor |
| 9 | driver out of NetBSD (with permission), | 9 | driver out of NetBSD (with permission), |
| 10 | and are copyrighted (c) 1995 Mark Tinguely and Jim Lowe | 10 | and are copyrighted (c) 1995 Mark Tinguely and Jim Lowe |
| 11 | (Thanks !) | 11 | (Thanks !) |
| 12 | 12 | ||
| 13 | Additional debugging and coding by Takashi Oe (toe@unlinfo.unl.edu) | 13 | Additional debugging and coding by Takashi Oe (toe@unlinfo.unl.edu) |
| 14 | 14 | ||
| 15 | The default values used for PlanB are my mistakes. | 15 | The default values used for PlanB are my mistakes. |