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/spider_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/spider_net.c')
| -rw-r--r-- | drivers/net/spider_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 90e663f4515c..40b51e6bc77b 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
| @@ -409,7 +409,7 @@ spider_net_free_rx_chain_contents(struct spider_net_card *card) | |||
| 409 | * @card: card structure | 409 | * @card: card structure |
| 410 | * @descr: descriptor to re-init | 410 | * @descr: descriptor to re-init |
| 411 | * | 411 | * |
| 412 | * Return 0 on succes, <0 on failure. | 412 | * Return 0 on success, <0 on failure. |
| 413 | * | 413 | * |
| 414 | * Allocates a new rx skb, iommu-maps it and attaches it to the | 414 | * Allocates a new rx skb, iommu-maps it and attaches it to the |
| 415 | * descriptor. Mark the descriptor as activated, ready-to-use. | 415 | * descriptor. Mark the descriptor as activated, ready-to-use. |