ARM: OMAP: Compile fix for cpu.h

Fixed ifdefs in cpu.h and reformatted a bit.

include/asm-arm/arch-omap/cpu.h

@@ -114,7 +114,6 @@ IS_OMAP_CLASS(24xx, 0x24)
 #  undef  cpu_is_omap16xx
 #  define cpu_is_omap16xx()		is_omap16xx()
 # endif
-# endif
 #else
 # if defined(CONFIG_ARCH_OMAP730)
 #  undef  cpu_is_omap7xx
@@ -199,10 +198,9 @@ IS_OMAP_TYPE(2420, 0x24)
 # define cpu_is_omap1710()		is_omap1710()
 #endif
 
-# if defined(CONFIG_ARCH_OMAP2420)
+#if defined(CONFIG_ARCH_OMAP2420)
 #  undef  cpu_is_omap2420
 #  define cpu_is_omap2420()		1
-# endif
 #endif
 
 #endif