diff options
| author |   Ryan Bradetich <rbrad@parisc-linux.org> | 2006-10-26 01:27:18 +0000 |
|---|---|---|
| committer |   Kyle McMartin <kyle@ubuntu.com> | 2006-12-08 00:33:59 -0500 |
| commit | 328d968e4fbbd439760c04de95998faeb092a9ed (patch) | |
| tree | 423515f3d35f9c420fe84a8a94c06aa75b5fe53f /include/asm-parisc | |
| parent | [PARISC] Unbreak discontigmem mem_init() (diff) | |
| download | linux-dev-328d968e4fbbd439760c04de95998faeb092a9ed.tar.xz linux-dev-328d968e4fbbd439760c04de95998faeb092a9ed.zip | |
[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 <rbrad@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'include/asm-parisc')
| -rw-r--r-- | include/asm-parisc/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) |