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

Commit 18e170d0 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branch 'omap-for-v3.8/cleanup-headers-iommu' of... 

Merge branch 'omap-for-v3.8/cleanup-headers-iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/omap
parents 9489e9dc 2ab7c848

arch/arm/mach-omap2/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ obj-$(CONFIG_HW_PERF_EVENTS) += pmu.o 
obj-$(CONFIG_OMAP_MBOX_FWK)		+= mailbox_mach.o

mailbox_mach-objs			:= mailbox.o



obj-$(CONFIG_OMAP_IOMMU)		+= iommu2.o



iommu-$(CONFIG_OMAP_IOMMU)		:= omap-iommu.o

obj-y					+= $(iommu-m) $(iommu-y)

arch/arm/mach-omap2/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static struct platform_device omap2cam_device = { 


#if defined(CONFIG_IOMMU_API)



#include <plat/iommu.h>

#include <linux/platform_data/iommu-omap.h>



static struct resource omap3isp_resources[] = {

	{

arch/arm/mach-omap2/omap-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>



#include <plat/iommu.h>

#include <linux/platform_data/iommu-omap.h>



#include "soc.h"

#include "common.h"

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
#include <plat/mmc.h>

#include <linux/platform_data/asoc-ti-mcbsp.h>

#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/platform_data/iommu-omap.h>

#include <plat/dmtimer.h>

#include <plat/iommu.h>



#include "am35xx.h"

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
#include <plat/dma.h>

#include <linux/platform_data/spi-omap2-mcspi.h>

#include <linux/platform_data/asoc-ti-mcbsp.h>

#include <linux/platform_data/iommu-omap.h>

#include <plat/mmc.h>

#include <plat/dmtimer.h>

#include <plat/common.h>

#include <plat/iommu.h>



#include "omap_hwmod_common_data.h"

#include "cm1_44xx.h"