Merge branch 'iommu/fixes-2.6.29' of git://git.kernel.org/pub/scm/lin…

…ux/kernel/git/joro/linux-2.6-iommu into core/iommu
git-mirror · Mar 5, 2009 · 0bd5c4f · 0bd5c4f
2 parents 7df4edb + ff2c8a4
commit 0bd5c4f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
@@ -24,9 +24,7 @@
 #include <linux/scatterlist.h>
 #include <linux/dma-mapping.h>
 #include <linux/iommu-helper.h>
-#ifdef CONFIG_IOMMU_API
 #include <linux/iommu.h>
-#endif
 #include <asm/proto.h>
 #include <asm/iommu.h>
 #include <asm/gart.h>

diff --git a/drivers/base/iommu.c b/drivers/base/iommu.c
@@ -31,7 +31,7 @@ void register_iommu(struct iommu_ops *ops)
 	iommu_ops = ops;
 }
 
-bool iommu_found()
+bool iommu_found(void)
 {
 	return iommu_ops != NULL;
 }