From: FUJITA Tomonori Date: Wed, 26 May 2010 21:44:39 +0000 (-0700) Subject: m68k: use asm-generic/scatterlist.h X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9da655480c36bd128a467e6b1183b2caf4716fd1;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git m68k: use asm-generic/scatterlist.h Signed-off-by: FUJITA Tomonori Acked-by: Geert Uytterhoeven Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/m68k/include/asm/scatterlist.h b/arch/m68k/include/asm/scatterlist.h index e27ad902b1cf..175da06c6b95 100644 --- a/arch/m68k/include/asm/scatterlist.h +++ b/arch/m68k/include/asm/scatterlist.h @@ -1,23 +1,9 @@ #ifndef _M68K_SCATTERLIST_H #define _M68K_SCATTERLIST_H -#include - -struct scatterlist { -#ifdef CONFIG_DEBUG_SG - unsigned long sg_magic; -#endif - unsigned long page_link; - unsigned int offset; - unsigned int length; - - dma_addr_t dma_address; /* A place to hang host-specific addresses at. */ -}; +#include /* This is bogus and should go away. */ #define ISA_DMA_THRESHOLD (0x00ffffff) -#define sg_dma_address(sg) ((sg)->dma_address) -#define sg_dma_len(sg) ((sg)->length) - #endif /* !(_M68K_SCATTERLIST_H) */