diff options
author | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
commit | bed04a4413376265746053be2a9cfbfc80c98ec9 (patch) | |
tree | 8f582294a655f70496cd08aedeb86de31dbad140 /include/linux/iommu-helper.h | |
parent | e37c772e36a7943b2e0bd8f48312e78474c0df15 (diff) | |
parent | c463be3520065ef8c05e3cbdf946c69604e91ceb (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/iommu-helper.h')
-rw-r--r-- | include/linux/iommu-helper.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/iommu-helper.h b/include/linux/iommu-helper.h index 4dd4c04ff2f4..c975caf75385 100644 --- a/include/linux/iommu-helper.h +++ b/include/linux/iommu-helper.h | |||
@@ -1,3 +1,6 @@ | |||
1 | extern int iommu_is_span_boundary(unsigned int index, unsigned int nr, | ||
2 | unsigned long shift, | ||
3 | unsigned long boundary_size); | ||
1 | extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size, | 4 | extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size, |
2 | unsigned long start, unsigned int nr, | 5 | unsigned long start, unsigned int nr, |
3 | unsigned long shift, | 6 | unsigned long shift, |