diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-14 00:57:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-14 00:57:58 +0100 |
| commit | 8eefb2b7ad6195f4324629f35be0b9443cd8ee96 (patch) | |
| tree | af0da81d6715e9fa84763f1aba6b6fb691c4a6db /include | |
| parent | Driver core: deprecate PM_LEGACY, default it to N (diff) | |
| parent | [IA64] Move sg_dma_{len,address} from pci.h to scatterlist.h (diff) | |
| download | linux-8eefb2b7ad6195f4324629f35be0b9443cd8ee96.tar.xz linux-8eefb2b7ad6195f4324629f35be0b9443cd8ee96.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/pci.h | 3 | ||||
| -rw-r--r-- | 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 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) #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 834a189ef189..9dbea8844d5e 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 */ |