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/iseries_veth.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/iseries_veth.c')
| -rw-r--r-- | drivers/net/iseries_veth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index aa7286bc4364..8739ba850f82 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
| @@ -1384,7 +1384,7 @@ static inline void veth_build_dma_list(struct dma_chunk *list, | |||
| 1384 | unsigned long done; | 1384 | unsigned long done; |
| 1385 | int i = 1; | 1385 | int i = 1; |
| 1386 | 1386 | ||
| 1387 | /* FIXME: skbs are continguous in real addresses. Do we | 1387 | /* FIXME: skbs are contiguous in real addresses. Do we |
| 1388 | * really need to break it into PAGE_SIZE chunks, or can we do | 1388 | * really need to break it into PAGE_SIZE chunks, or can we do |
| 1389 | * it just at the granularity of iSeries real->absolute | 1389 | * it just at the granularity of iSeries real->absolute |
| 1390 | * mapping? Indeed, given the way the allocator works, can we | 1390 | * mapping? Indeed, given the way the allocator works, can we |