Merge branch 'x86/iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into for-linus

This commit is contained in:
Jesse Barnes 2008-07-28 14:31:10 -07:00 • committed by Jesse Barnes
commit 29111f579f
4 changed files with 18 additions and 15 deletions

View file

@ -8,3 +8,4 @@ extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
unsigned long align_mask);
extern void iommu_area_free(unsigned long *map, unsigned long start,
unsigned int nr);
extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);