diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/telephony/ixj.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/telephony/ixj.c')
| -rw-r--r-- | drivers/telephony/ixj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index 5578a9dd04e8..f6b2948ab288 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c | |||
| @@ -5712,7 +5712,7 @@ static int ixj_daa_write(IXJ *j) | |||
| 5712 | return 1; | 5712 | return 1; |
| 5713 | } | 5713 | } |
| 5714 | 5714 | ||
| 5715 | int ixj_set_tone_off(unsigned short arg, IXJ *j) | 5715 | static int ixj_set_tone_off(unsigned short arg, IXJ *j) |
| 5716 | { | 5716 | { |
| 5717 | j->tone_off_time = arg; | 5717 | j->tone_off_time = arg; |
| 5718 | if (ixj_WriteDSPCommand(0x6E05, j)) /* Set Tone Off Period */ | 5718 | if (ixj_WriteDSPCommand(0x6E05, j)) /* Set Tone Off Period */ |