diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/telephony | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/telephony')
| -rw-r--r-- | drivers/telephony/ixj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index 40de151f2789..e89304c72568 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c | |||
| @@ -4190,7 +4190,7 @@ static void ixj_aec_start(IXJ *j, int level) | |||
| 4190 | ixj_WriteDSPCommand(0x1224, j); | 4190 | ixj_WriteDSPCommand(0x1224, j); |
| 4191 | 4191 | ||
| 4192 | ixj_WriteDSPCommand(0xE014, j); | 4192 | ixj_WriteDSPCommand(0xE014, j); |
| 4193 | ixj_WriteDSPCommand(0x0003, j); /* Lock threashold at 3dB */ | 4193 | ixj_WriteDSPCommand(0x0003, j); /* Lock threshold at 3dB */ |
| 4194 | 4194 | ||
| 4195 | ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */ | 4195 | ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */ |
| 4196 | 4196 | ||
| @@ -4235,7 +4235,7 @@ static void ixj_aec_start(IXJ *j, int level) | |||
| 4235 | ixj_WriteDSPCommand(0x1224, j); | 4235 | ixj_WriteDSPCommand(0x1224, j); |
| 4236 | 4236 | ||
| 4237 | ixj_WriteDSPCommand(0xE014, j); | 4237 | ixj_WriteDSPCommand(0xE014, j); |
| 4238 | ixj_WriteDSPCommand(0x0003, j); /* Lock threashold at 3dB */ | 4238 | ixj_WriteDSPCommand(0x0003, j); /* Lock threshold at 3dB */ |
| 4239 | 4239 | ||
| 4240 | ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */ | 4240 | ixj_WriteDSPCommand(0xE338, j); /* Set Echo Suppresser Attenuation to 0dB */ |
| 4241 | 4241 | ||