Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7806ca89bc0437d9952c6337d3bbddf1ea3591ff
Commit: 7806ca89bc0437d9952c6337d3bbddf1ea3591ff
Parent: 445722f97a0ecd3aed3f53d9f0dcaacaef8c6223
Author: Tony Luck <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 13 13:15:10 2006 -0800
Committer: Tony Luck <[EMAIL PROTECTED]>
CommitDate: Wed Dec 13 13:15:10 2006 -0800
[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 <[EMAIL PROTECTED]>
---
include/asm-ia64/pci.h | 3 ---
include/asm-ia64/scatterlist.h | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index 825eb7d..556f53f 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)
#define pci_dac_dma_sync_single_for_cpu(dev,dma_addr,len,dir) do { } while (0)
#define pci_dac_dma_sync_single_for_device(dev,dma_addr,len,dir) do {
mb(); } while (0)
-#define sg_dma_len(sg) ((sg)->dma_length)
-#define sg_dma_address(sg) ((sg)->dma_address)
-
#ifdef CONFIG_PCI
static inline void pci_dma_burst_advice(struct pci_dev *pdev,
enum pci_dma_burst_strategy *strat,
diff --git a/include/asm-ia64/scatterlist.h b/include/asm-ia64/scatterlist.h
index 834a189..9dbea88 100644
--- a/include/asm-ia64/scatterlist.h
+++ b/include/asm-ia64/scatterlist.h
@@ -25,4 +25,7 @@ struct scatterlist {
*/
#define ISA_DMA_THRESHOLD 0xffffffff
+#define sg_dma_len(sg) ((sg)->dma_length)
+#define sg_dma_address(sg) ((sg)->dma_address)
+
#endif /* _ASM_IA64_SCATTERLIST_H */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
