summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2010-02-26 12:04:32 -0800
committerTony Luck <tony.luck@intel.com>2010-02-26 12:04:32 -0800
commit4d86e1b18d6de8446aa424b615b34e436d42c241 (patch)
tree862029bb99edc8809161acaf748c7b606cc02a7b /arch/ia64/include
parent65c9bb6cca78a3677c66c6b279d5d77aa863bb32 (diff)
parentb6dcefdef49000fc871a851cba4b48454343cde5 (diff)
downloadlinux-4d86e1b18d6de8446aa424b615b34e436d42c241.tar.gz
linux-4d86e1b18d6de8446aa424b615b34e436d42c241.tar.bz2
linux-4d86e1b18d6de8446aa424b615b34e436d42c241.zip
Pull misc2634 into release branch
Diffstat (limited to 'arch/ia64/include')
-rw-r--r--arch/ia64/include/asm/scatterlist.h24
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/ia64/include/asm/scatterlist.h b/arch/ia64/include/asm/scatterlist.h
index d6f57874041d..d8e98961dec7 100644
--- a/arch/ia64/include/asm/scatterlist.h
+++ b/arch/ia64/include/asm/scatterlist.h
@@ -2,25 +2,6 @@
#define _ASM_IA64_SCATTERLIST_H
/*
- * Modified 1998-1999, 2001-2002, 2004
- * David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
- */
-
-#include <asm/types.h>
-
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
- unsigned long sg_magic;
-#endif
- unsigned long page_link;
- unsigned int offset;
- unsigned int length; /* buffer length */
-
- dma_addr_t dma_address;
- unsigned int dma_length;
-};
-
-/*
* It used to be that ISA_DMA_THRESHOLD had something to do with the
* DMA-limits of ISA-devices. Nowadays, its only remaining use (apart
* from the aha1542.c driver, which isn't 64-bit clean anyhow) is to
@@ -30,9 +11,6 @@ struct scatterlist {
*/
#define ISA_DMA_THRESHOLD 0xffffffff
-#define sg_dma_len(sg) ((sg)->dma_length)
-#define sg_dma_address(sg) ((sg)->dma_address)
-
-#define ARCH_HAS_SG_CHAIN
+#include <asm-generic/scatterlist.h>
#endif /* _ASM_IA64_SCATTERLIST_H */