[PATCH] omap iommu: renamed omap3-iommu to omap-iommu

[Felipe Contreras]

On Mon, May 10, 2010 at 12:16 PM, Hiroshi DOYU <Hiroshi.DOYU at nokia.com> wrote:
> From: Kanigeri, Hari <h-kanigeri2 at ti.com>
>
> This patch includes changes to omap3-iommu.c file to make it generic
> for all OMAPs. Renamed omap3-iommu.c to omap-iommu.c
>
> [Hiroshi DOYU: Remove unnecessary "iommy-y" in Makefile]
>
> Signed-off-by: Hari Kanigeri <h-kanigeri2 at ti.com>
> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU at nokia.com>
> ---
>  arch/arm/mach-omap2/Makefile                       |    5 +---
>  .../arm/mach-omap2/{omap3-iommu.c => omap-iommu.c} |   23 +++++++++++--------
>  2 files changed, 14 insertions(+), 14 deletions(-)
>  rename arch/arm/mach-omap2/{omap3-iommu.c => omap-iommu.c} (79%)

There's no need to have an 'omap-' prefix... iommu.c suffices.


> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index 4b9fc57..7d2cf0f 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -89,10 +89,7 @@ obj-$(CONFIG_OMAP3_EMU)                      += emu.o
>  obj-$(CONFIG_OMAP_MBOX_FWK)            += mailbox_mach.o
>  mailbox_mach-objs                      := mailbox.o
>
> -iommu-y                                        += iommu2.o
> -iommu-$(CONFIG_ARCH_OMAP3)             += omap3-iommu.o
> -
> -obj-$(CONFIG_OMAP_IOMMU)               += $(iommu-y)
> +obj-$(CONFIG_OMAP_IOMMU)               := iommu2.o omap-iommu.o

Hiroshi, these objects have to be always built-in, but if
CONFIG_OMAP_IOMMU=m, that would not be the case.

-- 
Felipe Contreras