git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
include
/
linux
/
scatterlist.h
diff --git
a/include/linux/scatterlist.h
b/include/linux/scatterlist.h
index
809b2ac
..
4571231
100644
(file)
--- a/
include/linux/scatterlist.h
+++ b/
include/linux/scatterlist.h
@@
-1,6
+1,7
@@
#ifndef _LINUX_SCATTERLIST_H
#define _LINUX_SCATTERLIST_H
#ifndef _LINUX_SCATTERLIST_H
#define _LINUX_SCATTERLIST_H
+#include <asm/types.h>
#include <asm/scatterlist.h>
#include <linux/mm.h>
#include <linux/string.h>
#include <asm/scatterlist.h>
#include <linux/mm.h>
#include <linux/string.h>
@@
-255,7
+256,7
@@
static inline void sg_init_table(struct scatterlist *sgl, unsigned int nents)
* on the sg page.
*
**/
* on the sg page.
*
**/
-static inline
unsigned long
sg_phys(struct scatterlist *sg)
+static inline
dma_addr_t
sg_phys(struct scatterlist *sg)
{
return page_to_phys(sg_page(sg)) + sg->offset;
}
{
return page_to_phys(sg_page(sg)) + sg->offset;
}