From: Ryan Bradetich Date: Thu, 26 Oct 2006 01:27:18 +0000 (+0000) Subject: [PARISC] Fix ccio_request_resource when CONFIG_IOMMU_CCIO is not defined X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=328d968e4fbbd439760c04de95998faeb092a9ed;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git [PARISC] Fix ccio_request_resource when CONFIG_IOMMU_CCIO is not defined This patch fixes the ccio_request_resource to work properly when the CONFIG_IOMMU_CCIO is not defined. This patch was tested on my E35. Signed-off-by: Ryan Bradetich Signed-off-by: Kyle McMartin --- diff --git a/include/asm-parisc/dma-mapping.h b/include/asm-parisc/dma-mapping.h index 66f0b408c669..c6c0e9ff6bde 100644 --- a/include/asm-parisc/dma-mapping.h +++ b/include/asm-parisc/dma-mapping.h @@ -236,7 +236,7 @@ int ccio_allocate_resource(const struct parisc_device *dev, unsigned long min, unsigned long max, unsigned long align); #else /* !CONFIG_IOMMU_CCIO */ #define ccio_get_iommu(dev) NULL -#define ccio_request_resource(dev, res) request_resource(&iomem_resource, res) +#define ccio_request_resource(dev, res) insert_resource(&iomem_resource, res) #define ccio_allocate_resource(dev, res, size, min, max, align) \ allocate_resource(&iomem_resource, res, size, min, max, \ align, NULL, NULL)