diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-24 00:28:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:47:24 -0400 |
commit | 912019572180f287e85b5534fbb1c1e3ca6df6c9 (patch) | |
tree | 2ce7306f6588408c6ee3b7258709e18dc8ec85fa /include/asm-mn10300/pci.h | |
parent | f0af566da6e9a4a2f5a83c5a70f3d0a772050e21 (diff) |
mn10300: move sg_dma_{address,len}() to asm/scatterlist.h
mn10300 was the only architecture where sg_dma_{address,len}() were not
in asm/scatterlist.h, and it's not a big surprise that this caused a
compile error somewhere:
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/videobuf-dma-sg.c: In function `videobuf_dma_map':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/videobuf-dma-sg.c:238: error: implicit declaration of function 'sg_dma_address'
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-mn10300/pci.h')
-rw-r--r-- | include/asm-mn10300/pci.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-mn10300/pci.h b/include/asm-mn10300/pci.h index 205192c52bb5..cd9cc5c89cea 100644 --- a/include/asm-mn10300/pci.h +++ b/include/asm-mn10300/pci.h | |||
@@ -74,15 +74,6 @@ struct pci_dev; | |||
74 | /* This is always fine. */ | 74 | /* This is always fine. */ |
75 | #define pci_dac_dma_supported(pci_dev, mask) (0) | 75 | #define pci_dac_dma_supported(pci_dev, mask) (0) |
76 | 76 | ||
77 | /* | ||
78 | * These macros should be used after a pci_map_sg call has been done | ||
79 | * to get bus addresses of each of the SG entries and their lengths. | ||
80 | * You should only work with the number of sg entries pci_map_sg | ||
81 | * returns. | ||
82 | */ | ||
83 | #define sg_dma_address(sg) ((sg)->dma_address) | ||
84 | #define sg_dma_len(sg) ((sg)->length) | ||
85 | |||
86 | /* Return the index of the PCI controller for device. */ | 77 | /* Return the index of the PCI controller for device. */ |
87 | static inline int pci_controller_num(struct pci_dev *dev) | 78 | static inline int pci_controller_num(struct pci_dev *dev) |
88 | { | 79 | { |