Hi all, This series cleans up the conflicting defines a bit more. Now the biggest problem is till in clock24xx.h, but at least the conflict is local. Now changing the processors should not cause everything to be rebuilt.. The first patch also fixes the CONFIG_SPINLOCK_DEBUG problem where sched_clock was called before we have things initialized. This series causes some updates to the other pending patch series, like the PM series. But it would be nice to get in before we add more code. Kevin, the 2/5 is improved version of what I sent you earlier, the earlier version had issues between 2420 vs 2430. Let me know if the other patches cause big headaches for your PM series. Regards, Tony --- Tony Lindgren (5): ARM: OMAP2/3: Remove OMAP_CM_REGADDR ARM: OMAP2/3: Remove OMAP2_PRCM_BASE ARM: OMAP2/3: Move define of OMAP2_VA_IC_BASE to be local to entry-macro.S ARM: OMAP2/3: Remove OMAP_PRM_REGADDR and OMAP2_PRM_BASE ARM: OMAP2/3: Remove OMAP2_32KSYNCT_BASE arch/arm/mach-omap2/clock24xx.c | 21 ++-- arch/arm/mach-omap2/clock24xx.h | 11 ++ arch/arm/mach-omap2/clock34xx.h | 2 arch/arm/mach-omap2/cm.h | 5 - arch/arm/mach-omap2/prm.h | 136 +++++++++++++------------ arch/arm/mach-omap2/sdrc2xxx.c | 5 + arch/arm/mach-omap2/sram242x.S | 4 - arch/arm/mach-omap2/sram243x.S | 4 - arch/arm/plat-omap/common.c | 69 +++++++++++-- arch/arm/plat-omap/include/mach/entry-macro.S | 9 +- arch/arm/plat-omap/include/mach/omap24xx.h | 18 --- arch/arm/plat-omap/include/mach/omap34xx.h | 9 -- 12 files changed, 170 insertions(+), 123 deletions(-) -- Signature -- 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