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: iommu: omap: Fix compile failure

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: iommu: omap: Fix compile failure
101041cf · Linus Torvalds · 5870b2c7 · 08f2e631 · 101041cf · 101041cf
Commit 101041cf authored Nov 15, 2011 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

drivers/iommu/omap-iommu-debug.c drivers/iommu/omap-iommu-debug.c +1 -0

drivers/iommu/omap-iovmm.c drivers/iommu/omap-iovmm.c +1 -0

No files found.
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -10,6 +10,7 @@
 * published by the Free Software Foundation.
 */
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>

--- a/drivers/iommu/omap-iovmm.c
+++ b/drivers/iommu/omap-iovmm.c
@@ -10,6 +10,7 @@
 * published by the Free Software Foundation.
 */
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>