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/net/ps3_gelic_net.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
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 b211613e9dbd..86fde1a90a5a 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
| @@ -296,7 +296,7 @@ static void gelic_card_reset_chain(struct gelic_card *card, | |||
| 296 | * @card: card structure | 296 | * @card: card structure |
| 297 | * @descr: descriptor to re-init | 297 | * @descr: descriptor to re-init |
| 298 | * | 298 | * |
| 299 | * return 0 on succes, <0 on failure | 299 | * return 0 on success, <0 on failure |
| 300 | * | 300 | * |
| 301 | * allocates a new rx skb, iommu-maps it and attaches it to the descriptor. | 301 | * allocates a new rx skb, iommu-maps it and attaches it to the descriptor. |
| 302 | * Activate the descriptor state-wise | 302 | * Activate the descriptor state-wise |