Skip to content

Commit

Permalink
cris: use asm-generic/scatterlist.h
Browse files Browse the repository at this point in the history
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
FUJITA Tomonori authored and Linus Torvalds committed May 27, 2010
1 parent 81a7919 commit 16b3f4d
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions arch/cris/include/asm/scatterlist.h
Original file line number Diff line number Diff line change
@@ -1,22 +1,7 @@
#ifndef __ASM_CRIS_SCATTERLIST_H
#define __ASM_CRIS_SCATTERLIST_H

struct scatterlist {
#ifdef CONFIG_DEBUG_SG
unsigned long sg_magic;
#endif
char * address; /* Location data is to be transferred to */
unsigned int length;

/* The following is i386 highmem junk - not used by us */
unsigned long page_link;
unsigned int offset;/* for highmem, page offset */

};

#define sg_dma_address(sg) ((sg)->address)
#define sg_dma_len(sg) ((sg)->length)
/* i386 junk */
#include <asm-generic/scatterlist.h>

#define ISA_DMA_THRESHOLD (0x1fffffff)

Expand Down

0 comments on commit 16b3f4d

Please sign in to comment.