* Sanjeev Premi <[email protected]> [090817 13:59]: > The #endif at end of the file was missing. However, an > additional #else ... #endif was causing the compiler to > keep going. > > The problem was found when compiler started reporting > the newly added inline functions were being reported as > redeclared by the compiler. > > Signed-off-by: Sanjeev Premi <[email protected]> > --- > arch/arm/plat-omap/include/mach/cpu.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/plat-omap/include/mach/cpu.h > b/arch/arm/plat-omap/include/mach/cpu.h > index 11e73d9..4fbc6a9 100644 > --- a/arch/arm/plat-omap/include/mach/cpu.h > +++ b/arch/arm/plat-omap/include/mach/cpu.h > @@ -317,8 +317,6 @@ IS_OMAP_TYPE(3430, 0x3430) > # undef cpu_is_omap730 > # define cpu_is_omap730() 1 > # endif > -#endif > -#else
Hmm, to me it looks like this should remove the second #endif, but keep the #else for the !MULTI_OMAP1 configurations. > # if defined(CONFIG_ARCH_OMAP850) > # undef cpu_is_omap850 > # define cpu_is_omap850() 1 > @@ -433,3 +431,5 @@ IS_OMAP_TYPE(3430, 0x3430) > > int omap_chip_is(struct omap_chip_id oci); > void omap2_check_revision(void); > + > +#endif /* __ASM_ARCH_OMAP_CPU_H */ And this should not be needed. Regards, Tony > -- > 1.6.2.2 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
