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/atm | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/iphase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index b2c1b37ab2e4..f734b345ac71 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
| @@ -1132,7 +1132,7 @@ static int rx_pkt(struct atm_dev *dev) | |||
| 1132 | IF_ERR(printk(" cause: packet time out\n");) | 1132 | IF_ERR(printk(" cause: packet time out\n");) |
| 1133 | } | 1133 | } |
| 1134 | else { | 1134 | else { |
| 1135 | IF_ERR(printk(" cause: buffer over flow\n");) | 1135 | IF_ERR(printk(" cause: buffer overflow\n");) |
| 1136 | } | 1136 | } |
| 1137 | goto out_free_desc; | 1137 | goto out_free_desc; |
| 1138 | } | 1138 | } |