linux-omap-pm 2.6.29: update to latest git HEAD, sync patches and defconfig with...
[openembedded.git] / recipes / linux / linux-omap-pm-2.6.29 / isp / iommu / 0005-omap-iommu-entries-for-Kconfig-and-Makefile.patch
1 From 7de046a6a8446358001c38ad1d0b2b829ca0c98c Mon Sep 17 00:00:00 2001
2 From: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
3 Date: Wed, 28 Jan 2009 21:32:08 +0200
4 Subject: [PATCH] omap iommu: entries for Kconfig and Makefile
5
6 Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
7 ---
8  arch/arm/plat-omap/Kconfig  |    8 ++++++++
9  arch/arm/plat-omap/Makefile |    1 +
10  2 files changed, 9 insertions(+), 0 deletions(-)
11
12 diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
13 index b16ae76..2090bb5 100644
14 --- a/arch/arm/plat-omap/Kconfig
15 +++ b/arch/arm/plat-omap/Kconfig
16 @@ -176,6 +176,14 @@ config OMAP_MBOX_FWK
17           Say Y here if you want to use OMAP Mailbox framework support for
18           DSP, IVA1.0 and IVA2 in OMAP1/2/3.
19  
20 +config OMAP_IOMMU
21 +       tristate "IOMMU support"
22 +       depends on ARCH_OMAP
23 +       default n
24 +       help
25 +         Say Y here if you want to use OMAP IOMMU support for IVA2 and
26 +         Camera in OMAP3.
27 +
28  choice
29          prompt "System timer"
30         default OMAP_MPU_TIMER
31 diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
32 index 3ebc09e..aa8f6df 100644
33 --- a/arch/arm/plat-omap/Makefile
34 +++ b/arch/arm/plat-omap/Makefile
35 @@ -13,6 +13,7 @@ obj-  :=
36  obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
37  
38  obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
39 +obj-$(CONFIG_OMAP_IOMMU) += iommu.o iovmm.o
40  
41  obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
42  obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
43 -- 
44 1.5.6.5
45