diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 14:37:43 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 14:37:43 -0400 |
| commit | 696314cf53b7b2d1f91af6da259533eb9611e7bf (patch) | |
| tree | 8e1bf5ea4c322f8b6985b1349d768d2837e417db /arch/arm/plat-omap/iovmm.c | |
| parent | 419bb4e0641cf7d84b1684b15afdd176f25c7ebe (diff) | |
| parent | e9d0b97eef235eccc3df9ddb9895b35c53a8aaa2 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into fixes
Diffstat (limited to 'arch/arm/plat-omap/iovmm.c')
| -rw-r--r-- | arch/arm/plat-omap/iovmm.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/iovmm.c b/arch/arm/plat-omap/iovmm.c index c60737c49a32..79e7fedb8602 100644 --- a/arch/arm/plat-omap/iovmm.c +++ b/arch/arm/plat-omap/iovmm.c | |||
| @@ -423,9 +423,6 @@ static void sgtable_fill_kmalloc(struct sg_table *sgt, u32 pa, u32 da, | |||
| 423 | { | 423 | { |
| 424 | unsigned int i; | 424 | unsigned int i; |
| 425 | struct scatterlist *sg; | 425 | struct scatterlist *sg; |
| 426 | void *va; | ||
| 427 | |||
| 428 | va = phys_to_virt(pa); | ||
| 429 | 426 | ||
| 430 | for_each_sg(sgt->sgl, sg, sgt->nents, i) { | 427 | for_each_sg(sgt->sgl, sg, sgt->nents, i) { |
| 431 | unsigned bytes; | 428 | unsigned bytes; |