diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /drivers/media/video/tea6420.c | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'drivers/media/video/tea6420.c')
| -rw-r--r-- | drivers/media/video/tea6420.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c index 0446524d3543..6bf6bc7dbc7f 100644 --- a/drivers/media/video/tea6420.c +++ b/drivers/media/video/tea6420.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | The tea6420 is a bus controlled audio-matrix with 5 stereo inputs, | 7 | The tea6420 is a bus controlled audio-matrix with 5 stereo inputs, |
| 8 | 4 stereo outputs and gain control for each output. | 8 | 4 stereo outputs and gain control for each output. |
| 9 | It is cascadable, i.e. it can be found at the adresses 0x98 | 9 | It is cascadable, i.e. it can be found at the addresses 0x98 |
| 10 | and 0x9a on the i2c-bus. | 10 | and 0x9a on the i2c-bus. |
| 11 | 11 | ||
| 12 | For detailed informations download the specifications directly | 12 | For detailed informations download the specifications directly |