summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-09 08:08:14 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-09 08:08:14 -0800
commit592d44a5f8458892c007c61b9cfa677efede5e1e (patch)
treecec376faf5dd25e1ce89134b0503d8354e473392 /arch
parent3ab345fc4b95a981a83f616487bbe07ddb5b1b1a (diff)
parentb2c1639135c0fc1560f3fe9a3a83f2c8265a9e02 (diff)
downloadlinux-592d44a5f8458892c007c61b9cfa677efede5e1e.tar.bz2
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
* 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: MAINTAINERS: Update amd-iommu F: patterns iommu/amd: Fix typo in kernel-parameters.txt iommu/msm: Fix compile error in mach-msm/devices-iommu.c Fix comparison using wrong pointer variable in dma debug code
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-msm/devices-iommu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/devices-iommu.c b/arch/arm/mach-msm/devices-iommu.c
index 24030d0da6e3..0fb7a17df398 100644
--- a/arch/arm/mach-msm/devices-iommu.c
+++ b/arch/arm/mach-msm/devices-iommu.c
@@ -18,6 +18,7 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/bootmem.h>
+#include <linux/module.h>
#include <mach/irqs.h>
#include <mach/iommu.h>