diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:41:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:41:34 +0200 |
| commit | 4b336b0625fe822cdc21646cc3bc3abacf05a3d0 (patch) | |
| tree | fc55023a26b76d8d2cc61803dc09323e020abf4e /include/linux | |
| parent | xen: compile irq functions without -pg for ftrace (diff) | |
| parent | generic, x86: fix add iommu_num_pages helper function (diff) | |
Merge branch 'x86/urgent' into x86/xen
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/iommu-helper.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/iommu-helper.h b/include/linux/iommu-helper.h index f8598f583944..c975caf75385 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); |