Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 101041cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 5870b2c7 08f2e631

drivers/iommu/omap-iommu-debug.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

drivers/iommu/omap-iovmm.c

+1 −0
Original line number Diff line number Diff line
@@ -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>