tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move sg_dma_{len,address} from pci.h to scatterlist.h

Linus Torvalds 8eefb2b7 f89bce3d

+3 -3
unified split
-3
include/asm-ia64/pci.h
··· 78 78 #define pci_dac_dma_sync_single_for_cpu(dev,dma_addr,len,dir) do { } while (0) 79 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 81 #ifdef CONFIG_PCI 85 82 static inline void pci_dma_burst_advice(struct pci_dev *pdev, 86 83 enum pci_dma_burst_strategy *strat,
+3
include/asm-ia64/scatterlist.h
··· 25 25 */ 26 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 31 #endif /* _ASM_IA64_SCATTERLIST_H */