Commit 0bd5c4f7 authored by Ingo Molnar's avatar Ingo Molnar

Merge branch 'iommu/fixes-2.6.29' of...

Merge branch 'iommu/fixes-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
parents 7df4edb0 ff2c8a41
...@@ -24,9 +24,7 @@ ...@@ -24,9 +24,7 @@
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/iommu-helper.h> #include <linux/iommu-helper.h>
#ifdef CONFIG_IOMMU_API
#include <linux/iommu.h> #include <linux/iommu.h>
#endif
#include <asm/proto.h> #include <asm/proto.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/gart.h> #include <asm/gart.h>
......
...@@ -31,7 +31,7 @@ void register_iommu(struct iommu_ops *ops) ...@@ -31,7 +31,7 @@ void register_iommu(struct iommu_ops *ops)
iommu_ops = ops; iommu_ops = ops;
} }
bool iommu_found() bool iommu_found(void)
{ {
return iommu_ops != NULL; return iommu_ops != NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment