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

diff --cc arch/x86/kernel/amd_iommu.c
index 008e522b9536aab02b1a8f5bbd59c73f86e93287,d7a7c4c063ff750880ba72ca0850ace5ba23eba1..c5962fe3796fbabe71024e3892354e8297d23a5f
--- 1/arch/x86/kernel/amd_iommu.c
--- 2/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>