diff options
| author | Chris Zankel <chris@zankel.net> | 2014-11-10 09:05:43 +0100 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-11-10 09:05:43 +0100 |
| commit | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (patch) | |
| tree | ea1ee0a54d4c24221a1e80cd07e899f8b34a6920 /arch/arm/mm/dma-mapping.c | |
| parent | Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xte... (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.tar.xz linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.zip | |
Merge tag 'v3.18-rc4' into for_next
Linux 3.18-rc4
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
| -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 c245d903927f..e8907117861e 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1198,7 +1198,6 @@ __iommu_alloc_remap(struct page **pages, size_t size, gfp_t gfp, pgprot_t prot, { return dma_common_pages_remap(pages, size, VM_ARM_DMA_CONSISTENT | VM_USERMAP, prot, caller); - return NULL; } /* |