diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /arch/x86/include/asm/iommu.h | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
Diffstat (limited to 'arch/x86/include/asm/iommu.h')
| -rw-r--r-- | arch/x86/include/asm/iommu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h index 98e28ea8cd16..e4a552d44465 100644 --- a/arch/x86/include/asm/iommu.h +++ b/arch/x86/include/asm/iommu.h | |||
| @@ -7,7 +7,6 @@ extern struct dma_mapping_ops nommu_dma_ops; | |||
| 7 | extern int force_iommu, no_iommu; | 7 | extern int force_iommu, no_iommu; |
| 8 | extern int iommu_detected; | 8 | extern int iommu_detected; |
| 9 | extern int dmar_disabled; | 9 | extern int dmar_disabled; |
| 10 | extern int forbid_dac; | ||
| 11 | 10 | ||
| 12 | extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len); | 11 | extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len); |
| 13 | 12 | ||