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
This commit is contained in:
Коммит
8eefb2b7ad
|
@ -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,
|
||||
|
|
|
@ -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 */
|
||||
|
|
Загрузка…
Ссылка в новой задаче