diff options
| author | Gary King <gking@nvidia.com> | 2009-12-15 10:48:02 -0800 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2009-12-15 18:44:46 -0800 |
| commit | 5e712675183894326ea39f8746334d64da71d1f4 (patch) | |
| tree | 02ae13e3f60f6640beae454d964f9b1e3dbd5408 /arch/arm/mm | |
| parent | 135bbc887bb5e037214b8eccea2c9fe74c207424 (diff) | |
ARM: fix broken merge
fixes the broken merge from the ARM-2.6.28 branch, left a variable declared
twice
Change-Id: I40b673ecf14c40f006145e0e197ecc5ab4aa8f46
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 5e72e7c7faff..9198f94fac89 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -326,7 +326,6 @@ static int dma_mmap(struct device *dev, struct vm_area_struct *vma, #ifdef CONFIG_MMU unsigned long flags, user_size, kern_size; struct arm_vm_region *c; - int ret = -ENXIO; user_size = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; |