* Tony Lindgren [100517 19:37]: > Add separate omap_i2c_add_bus functions for mach-omap1 > and mach-omap2. Make the mach-omap2 init set the interrupt > dynamically to support. > > This is needed to add support for omap4 in a way that > works with multi-omap builds. This will eventually get > fixed with the omap hwmods. Looks like these first two patches cause a self-created merge conflict with Ben's i2c branch. Reposting the first two patches rebased on what's in for-next. Regards, Tony