aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2006-12-13 16:15:10 -0500
committerTony Luck <tony.luck@intel.com>2006-12-13 16:15:10 -0500
commit7806ca89bc0437d9952c6337d3bbddf1ea3591ff (patch)
tree0475b102340fe3d9df78b1ef8c6f8b49e48a63bb
parent445722f97a0ecd3aed3f53d9f0dcaacaef8c6223 (diff)
[IA64] Move sg_dma_{len,address} from pci.h to scatterlist.h
IA64 is in a tiny minority providing these defines in pci.h. Almost everyone else has them in scatterlist.h Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--include/asm-ia64/pci.h3
-rw-r--r--include/asm-ia64/scatterlist.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index 825eb7d882e6..556f53fa44cb 100644
--- a/include/asm-ia64/pci.h
+++ b/include/asm-ia64/pci.h
@@ -78,9 +78,6 @@ pcibios_penalize_isa_irq (int irq, int active)
78#define pci_dac_dma_sync_single_for_cpu(dev,dma_addr,len,dir) do { } while (0) 78#define pci_dac_dma_sync_single_for_cpu(dev,dma_addr,len,dir) do { } while (0)
79#define pci_dac_dma_sync_single_for_device(dev,dma_addr,len,dir) do { mb(); } while (0) 79#define pci_dac_dma_sync_single_for_device(dev,dma_addr,len,dir) do { mb(); } while (0)
80 80
81#define sg_dma_len(sg) ((sg)->dma_length)
82#define sg_dma_address(sg) ((sg)->dma_address)
83
84#ifdef CONFIG_PCI 81#ifdef CONFIG_PCI
85static inline void pci_dma_burst_advice(struct pci_dev *pdev, 82static inline void pci_dma_burst_advice(struct pci_dev *pdev,
86 enum pci_dma_burst_strategy *strat, 83 enum pci_dma_burst_strategy *strat,
diff --git a/include/asm-ia64/scatterlist.h b/include/asm-ia64/scatterlist.h
index 834a189ef189..9dbea8844d5e 100644
--- a/include/asm-ia64/scatterlist.h
+++ b/include/asm-ia64/scatterlist.h
@@ -25,4 +25,7 @@ struct scatterlist {
25 */ 25 */
26#define ISA_DMA_THRESHOLD 0xffffffff 26#define ISA_DMA_THRESHOLD 0xffffffff
27 27
28#define sg_dma_len(sg) ((sg)->dma_length)
29#define sg_dma_address(sg) ((sg)->dma_address)
30
28#endif /* _ASM_IA64_SCATTERLIST_H */ 31#endif /* _ASM_IA64_SCATTERLIST_H */