projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[cascardo/linux.git]
/
include
/
asm-powerpc
/
scatterlist.h
diff --git
a/include/asm-powerpc/scatterlist.h
b/include/asm-powerpc/scatterlist.h
index
b075f61
..
fcf7d55
100644
(file)
--- a/
include/asm-powerpc/scatterlist.h
+++ b/
include/asm-powerpc/scatterlist.h
@@
-14,7
+14,10
@@
#include <asm/dma.h>
struct scatterlist {
- struct page *page;
+#ifdef CONFIG_DEBUG_SG
+ unsigned long sg_magic;
+#endif
+ unsigned long page_link;
unsigned int offset;
unsigned int length;