aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/iommu-helper.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 10:28:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 10:28:17 -0700
commit57b1494d2ba544c62673234da6115c21fac27ffc (patch)
tree34f91f3187805fa034f8e63966d471ba2498d148 /include/linux/iommu-helper.h
parent9fe3b64be3dc8313e9fa87255f169c608d074cbd (diff)
parent8978b74253280d59e97cf49a3ec2c0cbccd5b801 (diff)
downloadmrst-s0i3-test-57b1494d2ba544c62673234da6115c21fac27ffc.tar.gz
mrst-s0i3-test-57b1494d2ba544c62673234da6115c21fac27ffc.tar.xz
mrst-s0i3-test-57b1494d2ba544c62673234da6115c21fac27ffc.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: generic, x86: fix add iommu_num_pages helper function x86: remove stray <6> in BogoMIPS printk x86: move dma32_reserve_bootmem() after reserve_crashkernel()
Diffstat (limited to 'include/linux/iommu-helper.h')
-rw-r--r--include/linux/iommu-helper.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/iommu-helper.h b/include/linux/iommu-helper.h
index f8598f58394..c975caf7538 100644
--- a/include/linux/iommu-helper.h
+++ b/include/linux/iommu-helper.h
@@ -8,4 +8,3 @@ 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);