Moin, I just wanted to try out this patchset as i have a use for proper spi support on i.mx23. But this patch (4/10) fails to apply at line 635
On Fri, 6 Jul 2012 08:17:23 +0200 Marek Vasut <[email protected]> wrote: > diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c > index f9509e8..1ea1cba 100644 > --- a/drivers/mmc/host/mxs-mmc.c > +++ b/drivers/mmc/host/mxs-mmc.c > @@ -635,6 +640,7 @@ static int mxs_mmc_probe(struct platform_device *pdev) > dma_cap_mask_t mask; > struct regulator *reg_vmmc; > enum of_gpio_flags flags; > + struct mxs_ssp *ssp; > > iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); > dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0); The function variables do not match. Also a 3way merge didnt work as the comit on which this patchset was based on wasnt found. I tried linux, linux-next, and the imx repos from pengutronix and Shawn, to no avail. Is there any other repo around that i'm not aware of? Attila Kinali -- The trouble with you, Shev, is you don't say anything until you've saved up a whole truckload of damned heavy brick arguments and then you dump them all out and never look at the bleeding body mangled beneath the heap -- Tirin, The Dispossessed, U. Le Guin ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ spi-devel-general mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/spi-devel-general
