diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-15 14:56:56 -0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-15 14:56:56 -0200 |
| commit | 101041cf2619b397b0fa7e2ab544607026d59314 (patch) | |
| tree | e214e297b3e52c0156fbca5a97056ee2a1829e8f | |
| parent | 5870b2c719b15cfe3f2de3e8be51bc6e17c67e7a (diff) | |
| parent | 08f2e6312c67fed80df9342e06ad36daf11eb80b (diff) | |
| download | lwn-101041cf2619b397b0fa7e2ab544607026d59314.tar.gz lwn-101041cf2619b397b0fa7e2ab544607026d59314.zip | |
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
| -rw-r--r-- | drivers/iommu/omap-iommu-debug.c | 1 | ||||
| -rw-r--r-- | drivers/iommu/omap-iovmm.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c index 9c192e79f806..288da5c1499d 100644 --- 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> diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c index e8fdb8830f69..46be456fcc00 100644 --- 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> |