Charulatha V <charu@xxxxxx> writes: > On 'origin/pm-wip/hwmods-omap4' branch, fix the following > compilation error: > > arch/arm/mach-omap2/omap_hwmod_3xxx_data.c:218: > error: 'omap34xx_sr1_hwmod' undeclared here (not in a function) > arch/arm/mach-omap2/omap_hwmod_3xxx_data.c:219: > error: 'omap34xx_sr2_hwmod' undeclared here (not in a function) > arch/arm/mach-omap2/omap_hwmod_3xxx_data.c:220: error: > 'omap36xx_sr1_hwmod' undeclared here (not in a function) > arch/arm/mach-omap2/omap_hwmod_3xxx_data.c:221: > error: 'omap36xx_sr2_hwmod' undeclared here (not in a function) > make[1]: *** [arch/arm/mach-omap2/omap_hwmod_3xxx_data.o] Error 1 > > Signed-off-by: Charulatha V <charu@xxxxxx> Oops, looks like a mis-merge on my part when adding the IVA hwmod data. I fixed this and just pushed an updated version of the pm-wip/hwmods branch and (rebased pm-wip/runtime and pm-wip/hwmods-omap4 on top.) Note that it make take a little time to propagate to the kernel.org mirrors. Kevin > --- > arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 ---- > 1 files changed, 0 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c > index f7e1ace..fe92b5d 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c > @@ -215,10 +215,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { > &omap3xxx_l4_wkup_hwmod, > &omap3xxx_mpu_hwmod, > &omap3xxx_iva2_hwmod, > - &omap34xx_sr1_hwmod, > - &omap34xx_sr2_hwmod, > - &omap36xx_sr1_hwmod, > - &omap36xx_sr2_hwmod, > NULL, > }; > > -- > 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html