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/isdn/i4l/isdn_common.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/isdn/i4l/isdn_common.c')
| -rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 81accdf35168..b26e509ec759 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
| @@ -933,7 +933,7 @@ isdn_readbchan_tty(int di, int channel, struct tty_struct *tty, int cisco_hack) | |||
| 933 | count_put = count_pull; | 933 | count_put = count_pull; |
| 934 | if(count_put > 1) | 934 | if(count_put > 1) |
| 935 | tty_insert_flip_string(tty, skb->data, count_put - 1); | 935 | tty_insert_flip_string(tty, skb->data, count_put - 1); |
| 936 | last = skb->data[count_put] - 1; | 936 | last = skb->data[count_put - 1]; |
| 937 | len -= count_put; | 937 | len -= count_put; |
| 938 | #ifdef CONFIG_ISDN_AUDIO | 938 | #ifdef CONFIG_ISDN_AUDIO |
| 939 | } | 939 | } |