diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /drivers/media/video/tvaudio.c | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/media/video/tvaudio.c')
| -rw-r--r-- | drivers/media/video/tvaudio.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index 9a493bea76d8..d8b78f1d686b 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
| @@ -864,13 +864,8 @@ static int tda9874a_getmode(struct CHIPSTATE *chip) | |||
| 864 | * But changing the mode to VIDEO_SOUND_MONO would switch | 864 | * But changing the mode to VIDEO_SOUND_MONO would switch |
| 865 | * external 4052 multiplexer in audio_hook(). | 865 | * external 4052 multiplexer in audio_hook(). |
| 866 | */ | 866 | */ |
| 867 | #if 0 | ||
| 868 | if((nsr & 0x02) && !(dsr & 0x10)) /* NSR.S/MB=1 and DSR.AMSTAT=0 */ | ||
| 869 | mode |= VIDEO_SOUND_STEREO; | ||
| 870 | #else | ||
| 871 | if(nsr & 0x02) /* NSR.S/MB=1 */ | 867 | if(nsr & 0x02) /* NSR.S/MB=1 */ |
| 872 | mode |= VIDEO_SOUND_STEREO; | 868 | mode |= VIDEO_SOUND_STEREO; |
| 873 | #endif | ||
| 874 | if(nsr & 0x01) /* NSR.D/SB=1 */ | 869 | if(nsr & 0x01) /* NSR.D/SB=1 */ |
| 875 | mode |= VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; | 870 | mode |= VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2; |
| 876 | } else { | 871 | } else { |