aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-05 12:47:34 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-05 12:47:34 +0100
commit0bd5c4f7c874cf48ff7904dcf8a59988c8fea0e8 (patch)
treea89023849fa29d7b6cb987e10e3ea8a995409c86
parent7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (diff)
parentff2c8a4167eb143c5e2a03148fa996978938e8d7 (diff)
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
-rw-r--r--arch/x86/kernel/amd_iommu.c2
-rw-r--r--drivers/base/iommu.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 008e522b953..c5962fe3796 100644
--- 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
index 5e039d4f877..c2d1eed9037 100644
--- 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;
}