diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/pci/iova.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/pci/iova.c')
| -rw-r--r-- | drivers/pci/iova.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/iova.c b/drivers/pci/iova.c index 7914951ef29a..9606e599a475 100644 --- a/drivers/pci/iova.c +++ b/drivers/pci/iova.c | |||
| @@ -391,7 +391,7 @@ reserve_iova(struct iova_domain *iovad, | |||
| 391 | break; | 391 | break; |
| 392 | } | 392 | } |
| 393 | 393 | ||
| 394 | /* We are here either becasue this is the first reserver node | 394 | /* We are here either because this is the first reserver node |
| 395 | * or need to insert remaining non overlap addr range | 395 | * or need to insert remaining non overlap addr range |
| 396 | */ | 396 | */ |
| 397 | iova = __insert_new_range(iovad, pfn_lo, pfn_hi); | 397 | iova = __insert_new_range(iovad, pfn_lo, pfn_hi); |