diff options
| author | Ryan Bradetich <rbrad@parisc-linux.org> | 2006-10-25 21:27:18 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@ubuntu.com> | 2006-12-08 00:33:59 -0500 |
| commit | 328d968e4fbbd439760c04de95998faeb092a9ed (patch) | |
| tree | 423515f3d35f9c420fe84a8a94c06aa75b5fe53f | |
| parent | 53faf2910d3539a963d171674ad6364ff2854eea (diff) | |
[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>
| -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, | |||
| 236 | unsigned long min, unsigned long max, unsigned long align); | 236 | unsigned long min, unsigned long max, unsigned long align); |
| 237 | #else /* !CONFIG_IOMMU_CCIO */ | 237 | #else /* !CONFIG_IOMMU_CCIO */ |
| 238 | #define ccio_get_iommu(dev) NULL | 238 | #define ccio_get_iommu(dev) NULL |
| 239 | #define ccio_request_resource(dev, res) request_resource(&iomem_resource, res) | 239 | #define ccio_request_resource(dev, res) insert_resource(&iomem_resource, res) |
| 240 | #define ccio_allocate_resource(dev, res, size, min, max, align) \ | 240 | #define ccio_allocate_resource(dev, res, size, min, max, align) \ |
| 241 | allocate_resource(&iomem_resource, res, size, min, max, \ | 241 | allocate_resource(&iomem_resource, res, size, min, max, \ |
| 242 | align, NULL, NULL) | 242 | align, NULL, NULL) |