diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ks8695/include/mach/memory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ks8695/include/mach/memory.h b/arch/arm/mach-ks8695/include/mach/memory.h index f7e1b9bce345..95e731a7ed6a 100644 --- a/arch/arm/mach-ks8695/include/mach/memory.h +++ b/arch/arm/mach-ks8695/include/mach/memory.h | |||
| @@ -34,7 +34,8 @@ extern struct bus_type platform_bus_type; | |||
| 34 | #define __arch_dma_to_virt(dev, x) ({ (void *) (is_lbus_device(dev) ? \ | 34 | #define __arch_dma_to_virt(dev, x) ({ (void *) (is_lbus_device(dev) ? \ |
| 35 | __phys_to_virt(x) : __bus_to_virt(x)); }) | 35 | __phys_to_virt(x) : __bus_to_virt(x)); }) |
| 36 | #define __arch_virt_to_dma(dev, x) ({ is_lbus_device(dev) ? \ | 36 | #define __arch_virt_to_dma(dev, x) ({ is_lbus_device(dev) ? \ |
| 37 | (dma_addr_t)__virt_to_phys(x) : (dma_addr_t)__virt_to_bus(x); }) | 37 | (dma_addr_t)__virt_to_phys((unsigned long)x) \ |
| 38 | : (dma_addr_t)__virt_to_bus(x); }) | ||
| 38 | #define __arch_pfn_to_dma(dev, pfn) \ | 39 | #define __arch_pfn_to_dma(dev, pfn) \ |
| 39 | ({ dma_addr_t __dma = __pfn_to_phys(pfn); \ | 40 | ({ dma_addr_t __dma = __pfn_to_phys(pfn); \ |
| 40 | if (!is_lbus_device(dev)) \ | 41 | if (!is_lbus_device(dev)) \ |