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/net/ps3_gelic_net.c | |
| 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/net/ps3_gelic_net.c')
| -rw-r--r-- | drivers/net/ps3_gelic_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index 89c4948300a5..0c768593aad0 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
| @@ -314,7 +314,7 @@ static void gelic_card_reset_chain(struct gelic_card *card, | |||
| 314 | * @card: card structure | 314 | * @card: card structure |
| 315 | * @descr: descriptor to re-init | 315 | * @descr: descriptor to re-init |
| 316 | * | 316 | * |
| 317 | * return 0 on succes, <0 on failure | 317 | * return 0 on success, <0 on failure |
| 318 | * | 318 | * |
| 319 | * allocates a new rx skb, iommu-maps it and attaches it to the descriptor. | 319 | * allocates a new rx skb, iommu-maps it and attaches it to the descriptor. |
| 320 | * Activate the descriptor state-wise | 320 | * Activate the descriptor state-wise |