On Thu, Jan 06, 2011 at 09:51:45AM +0100, Sascha Hauer wrote: > As Russell noted this conflicts with the current i.MX branch. In current > i.MX branch we have: > > - .boot_params = PHYS_OFFSET + 0x100, > + .boot_params = MX51_PHYS_OFFSET + 0x100, > > PLAT_PHYS_OFFSET should be defined to MX51_PHYS_OFFSET, so it shouldn't > matter which solution to the conflict we choose. I've actually dropped my modifications to this files as your change to them makes more sense longer term. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html