diff --git a/[refs] b/[refs] index 38960d14c8ca..67a675eb6019 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 962d69ed6f5c911fbdb23ef2304e3a5903e5ccbb +refs/heads/master: 7cf27cb4162bd586c015e32383f30bc7fbb3ff8a diff --git a/trunk/include/asm-m68knommu/scatterlist.h b/trunk/include/asm-m68knommu/scatterlist.h index 230b8d56d17f..12309b181d29 100644 --- a/trunk/include/asm-m68knommu/scatterlist.h +++ b/trunk/include/asm-m68knommu/scatterlist.h @@ -1,6 +1,8 @@ #ifndef _M68KNOMMU_SCATTERLIST_H #define _M68KNOMMU_SCATTERLIST_H +#include + struct scatterlist { struct page *page; unsigned int offset; @@ -8,6 +10,10 @@ struct scatterlist { unsigned int length; }; +#define sg_address(sg) (page_address((sg)->page) + (sg)->offset +#define sg_dma_address(sg) ((sg)->dma_address) +#define sg_dma_len(sg) ((sg)->length) + #define ISA_DMA_THRESHOLD (0xffffffff) #endif /* !(_M68KNOMMU_SCATTERLIST_H) */