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

[Russell King - ARM Linux]

On Mon, May 10, 2010 at 01:09:32PM +0300, Felipe Contreras wrote:
> > 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.

The above change is a no-op - which is good for this patch.  If it is
broken after with CONFIG_OMAP_IOMMU=m, then it was broken before the
patch.

If there was a problem here, it should be fixed by a separate patch
(and if it's broken in -rc, then such a patch needs to be sent upstream
as soon as it's validated.)