From 4665c21b1d2c3518a17394a51a951bba95cac329 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 26 May 2010 14:44:35 -0700 Subject: [PATCH] --- yaml --- r: 198846 b: refs/heads/master c: 81a791907e69146575e4463d2eb98cf17f55fdb1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/avr32/include/asm/scatterlist.h | 20 +------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 08763c324542..4b963aaeb191 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ef04370d823a811d2cca9f237097559a6b99b12 +refs/heads/master: 81a791907e69146575e4463d2eb98cf17f55fdb1 diff --git a/trunk/arch/avr32/include/asm/scatterlist.h b/trunk/arch/avr32/include/asm/scatterlist.h index 377320e3bd17..06394e5ead6c 100644 --- a/trunk/arch/avr32/include/asm/scatterlist.h +++ b/trunk/arch/avr32/include/asm/scatterlist.h @@ -1,25 +1,7 @@ #ifndef __ASM_AVR32_SCATTERLIST_H #define __ASM_AVR32_SCATTERLIST_H -#include - -struct scatterlist { -#ifdef CONFIG_DEBUG_SG - unsigned long sg_magic; -#endif - unsigned long page_link; - unsigned int offset; - dma_addr_t dma_address; - unsigned int length; -}; - -/* These macros should be used after a pci_map_sg call has been done - * to get bus addresses of each of the SG entries and their lengths. - * You should only work with the number of sg entries pci_map_sg - * returns. - */ -#define sg_dma_address(sg) ((sg)->dma_address) -#define sg_dma_len(sg) ((sg)->length) +#include #define ISA_DMA_THRESHOLD (0xffffffff)