diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /drivers/atm | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
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 | } |