On Mon, Sep 21, 2009 at 04:01:03PM +0100, Russell King - ARM Linux wrote: > On Wed, Sep 09, 2009 at 10:55:27PM +0200, Linus Walleij wrote: > > This moves the mmci platform data definition struct away from > > arch/arm/include/asm/mach/mmc.h into the more proper place among > > the other primecells in include/linux/amba/mmci.h and at the same > > time renames it to "mmci.h", and also the struct in this file > > confusingly named mmc_platform_data has been renamed > > mmci_platform_data for clarity. > > Not sure what's happened, but this patch appears to conflict with > another, resulting in: It's also meant that 5702/1 has been dropped in addition to 5699/1. In future, please ensure that you run a build check on the machines which you've modified. Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
