git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-m68k
/
scatterlist.h
diff --git
a/include/asm-m68k/scatterlist.h
b/include/asm-m68k/scatterlist.h
index
d7c9b5c
..
8e61226
100644
(file)
--- a/
include/asm-m68k/scatterlist.h
+++ b/
include/asm-m68k/scatterlist.h
@@
-2,18
+2,17
@@
#define _M68K_SCATTERLIST_H
struct scatterlist {
#define _M68K_SCATTERLIST_H
struct scatterlist {
- /* These two are only valid if ADDRESS member of this
- * struct is NULL.
- */
struct page *page;
unsigned int offset;
struct page *page;
unsigned int offset;
-
unsigned int length;
unsigned int length;
- __u32 d
vma_address;
/* A place to hang host-specific addresses at. */
+ __u32 d
ma_address;
/* A place to hang host-specific addresses at. */
};
/* This is bogus and should go away. */
#define ISA_DMA_THRESHOLD (0x00ffffff)
};
/* 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) */
#endif /* !(_M68K_SCATTERLIST_H) */