diff options
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/configs/bigsur_defconfig | 2 | ||||
-rw-r--r-- | arch/ia64/configs/zx1_defconfig | 2 | ||||
-rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig index 6dd8655664f3..ace41096b47b 100644 --- a/arch/ia64/configs/bigsur_defconfig +++ b/arch/ia64/configs/bigsur_defconfig | |||
@@ -752,7 +752,7 @@ CONFIG_I2C_ALGOBIT=y | |||
752 | # | 752 | # |
753 | # CONFIG_SENSORS_DS1337 is not set | 753 | # CONFIG_SENSORS_DS1337 is not set |
754 | # CONFIG_SENSORS_DS1374 is not set | 754 | # CONFIG_SENSORS_DS1374 is not set |
755 | # CONFIG_SENSORS_EEPROM is not set | 755 | # CONFIG_EEPROM_LEGACY is not set |
756 | # CONFIG_SENSORS_PCF8574 is not set | 756 | # CONFIG_SENSORS_PCF8574 is not set |
757 | # CONFIG_SENSORS_PCA9539 is not set | 757 | # CONFIG_SENSORS_PCA9539 is not set |
758 | # CONFIG_SENSORS_PCF8591 is not set | 758 | # CONFIG_SENSORS_PCF8591 is not set |
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 0a06b1333c95..514f0635dafe 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig | |||
@@ -841,7 +841,7 @@ CONFIG_I2C_ALGOPCF=y | |||
841 | # | 841 | # |
842 | # CONFIG_SENSORS_DS1337 is not set | 842 | # CONFIG_SENSORS_DS1337 is not set |
843 | # CONFIG_SENSORS_DS1374 is not set | 843 | # CONFIG_SENSORS_DS1374 is not set |
844 | # CONFIG_SENSORS_EEPROM is not set | 844 | # CONFIG_EEPROM_LEGACY is not set |
845 | # CONFIG_SENSORS_PCF8574 is not set | 845 | # CONFIG_SENSORS_PCF8574 is not set |
846 | # CONFIG_SENSORS_PCA9539 is not set | 846 | # CONFIG_SENSORS_PCA9539 is not set |
847 | # CONFIG_SENSORS_PCF8591 is not set | 847 | # CONFIG_SENSORS_PCF8591 is not set |
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index d98f0f4ff83f..6d5e6c5630e3 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c | |||
@@ -906,7 +906,7 @@ sba_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt) | |||
906 | * @dir: R/W or both. | 906 | * @dir: R/W or both. |
907 | * @attrs: optional dma attributes | 907 | * @attrs: optional dma attributes |
908 | * | 908 | * |
909 | * See Documentation/DMA-mapping.txt | 909 | * See Documentation/PCI/PCI-DMA-mapping.txt |
910 | */ | 910 | */ |
911 | dma_addr_t | 911 | dma_addr_t |
912 | sba_map_single_attrs(struct device *dev, void *addr, size_t size, int dir, | 912 | sba_map_single_attrs(struct device *dev, void *addr, size_t size, int dir, |
@@ -1024,7 +1024,7 @@ sba_mark_clean(struct ioc *ioc, dma_addr_t iova, size_t size) | |||
1024 | * @dir: R/W or both. | 1024 | * @dir: R/W or both. |
1025 | * @attrs: optional dma attributes | 1025 | * @attrs: optional dma attributes |
1026 | * | 1026 | * |
1027 | * See Documentation/DMA-mapping.txt | 1027 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1028 | */ | 1028 | */ |
1029 | void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size, | 1029 | void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size, |
1030 | int dir, struct dma_attrs *attrs) | 1030 | int dir, struct dma_attrs *attrs) |
@@ -1102,7 +1102,7 @@ EXPORT_SYMBOL(sba_unmap_single_attrs); | |||
1102 | * @size: number of bytes mapped in driver buffer. | 1102 | * @size: number of bytes mapped in driver buffer. |
1103 | * @dma_handle: IOVA of new buffer. | 1103 | * @dma_handle: IOVA of new buffer. |
1104 | * | 1104 | * |
1105 | * See Documentation/DMA-mapping.txt | 1105 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1106 | */ | 1106 | */ |
1107 | void * | 1107 | void * |
1108 | sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags) | 1108 | sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags) |
@@ -1165,7 +1165,7 @@ sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp | |||
1165 | * @vaddr: virtual address IOVA of "consistent" buffer. | 1165 | * @vaddr: virtual address IOVA of "consistent" buffer. |
1166 | * @dma_handler: IO virtual address of "consistent" buffer. | 1166 | * @dma_handler: IO virtual address of "consistent" buffer. |
1167 | * | 1167 | * |
1168 | * See Documentation/DMA-mapping.txt | 1168 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1169 | */ | 1169 | */ |
1170 | void sba_free_coherent (struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) | 1170 | void sba_free_coherent (struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle) |
1171 | { | 1171 | { |
@@ -1420,7 +1420,7 @@ sba_coalesce_chunks(struct ioc *ioc, struct device *dev, | |||
1420 | * @dir: R/W or both. | 1420 | * @dir: R/W or both. |
1421 | * @attrs: optional dma attributes | 1421 | * @attrs: optional dma attributes |
1422 | * | 1422 | * |
1423 | * See Documentation/DMA-mapping.txt | 1423 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1424 | */ | 1424 | */ |
1425 | int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents, | 1425 | int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents, |
1426 | int dir, struct dma_attrs *attrs) | 1426 | int dir, struct dma_attrs *attrs) |
@@ -1512,7 +1512,7 @@ EXPORT_SYMBOL(sba_map_sg_attrs); | |||
1512 | * @dir: R/W or both. | 1512 | * @dir: R/W or both. |
1513 | * @attrs: optional dma attributes | 1513 | * @attrs: optional dma attributes |
1514 | * | 1514 | * |
1515 | * See Documentation/DMA-mapping.txt | 1515 | * See Documentation/PCI/PCI-DMA-mapping.txt |
1516 | */ | 1516 | */ |
1517 | void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist, | 1517 | void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist, |
1518 | int nents, int dir, struct dma_attrs *attrs) | 1518 | int nents, int dir, struct dma_attrs *attrs) |