git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-omap
/
iommu.c
diff --git
a/arch/arm/plat-omap/iommu.c
b/arch/arm/plat-omap/iommu.c
index 905ed832df569ad3c33a0fc7f482707def80e9b9..0e137663349ce59d60fe45a6c5b3408da64ffe08 100644
(file)
--- a/
arch/arm/plat-omap/iommu.c
+++ b/
arch/arm/plat-omap/iommu.c
@@
-13,6
+13,7
@@
#include <linux/err.h>
#include <linux/module.h>
+#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <linux/clk.h>