* Premi, Sanjeev <premi@xxxxxx> [090929 04:34]: > Hi Tony, > > Can you push this patch to 2.6.32-rc1? > > 7a8d53a0: arch: arm: omap: terminate ifndef > > I was unable to refresh my patches against this baseline. > OR, is it okay if I re-submit against the 'master'. Sorry, I was meaning to look where the mismatch really came from but forgot. Looks like adding omap850 support added an #else without removing the #endif above it, and also removed another #endif in commit ae302f40061235f6bc58ae9ba02aa849d60223b5. I added some more comments to your original patch, see below. I did not notice earlier that adding omap850 also accidentally did both changes. So I was wondering where the second change came from.. Can you please check that this patch is still OK? Regards, Tony
>From 64fd0b5983e2b6f6bcf3ff66dc6b011b2c6d3c02 Mon Sep 17 00:00:00 2001 From: Sanjeev Premi <premi@xxxxxx> Date: Tue, 29 Sep 2009 13:21:26 -0700 Subject: [PATCH] omap: Fix mismatched ifdefs 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. This was caused by cd92204924fafbd5c7241dfd12ca3176d542e0c5 that added support for omap850. However, the patch accidentally removed the wrong ifdef: # define cpu_is_omap730() 1 # endif #endif +#else +# if defined(CONFIG_ARCH_OMAP850) +# undef cpu_is_omap850 +# define cpu_is_omap850() 1 +# endif +#endif ... void omap2_check_revision(void); #endif /* defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) */ - -#endif Instead of removing removing the #endif at the end of the file, the #endif before #else should have been removed. Signed-off-by: Sanjeev Premi <premi@xxxxxx> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h index 11e73d9..1acc4ec 100644 --- a/arch/arm/plat-omap/include/mach/cpu.h +++ b/arch/arm/plat-omap/include/mach/cpu.h @@ -317,7 +317,6 @@ IS_OMAP_TYPE(3430, 0x3430) # undef cpu_is_omap730 # define cpu_is_omap730() 1 # endif -#endif #else # if defined(CONFIG_ARCH_OMAP850) # undef cpu_is_omap850 @@ -433,3 +432,5 @@ IS_OMAP_TYPE(3430, 0x3430) int omap_chip_is(struct omap_chip_id oci); void omap2_check_revision(void); + +#endif
