From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 5 Mar 2009 11:47:34 +0000 (+0100)
Subject: Merge branch 'iommu/fixes-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0bd5c4f7c874cf48ff7904dcf8a59988c8fea0e8;p=linux-2.6-omap-h63xx.git

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
---

0bd5c4f7c874cf48ff7904dcf8a59988c8fea0e8
diff --cc arch/x86/kernel/amd_iommu.c
index 008e522b953,d7a7c4c063f..c5962fe3796
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@@ -22,11 -22,8 +22,9 @@@
  #include <linux/bitops.h>
  #include <linux/debugfs.h>
  #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>