Messages in this thread | | | Date | Mon, 2 Jul 2012 16:53:43 +0200 | From | Samuel Ortiz <> | Subject | Re: [PATCH] mfd: mc13xxx-spi: fix merge conflict |
| |
Hi Axel,
On Mon, Jul 02, 2012 at 04:03:00PM +0800, Axel Lin wrote: > This patch fixes conflict between commit 8ae3559 > "mfd: mc13xxx workaround SPI hardware bug on i.Mx" > and commit 10c7a5d "mfd: Use devm_* APIs for mc13xxx". > > commit 8ae3559 changes regmap_init_spi to regmap_init. > So now we need to use devm_regmap_init rather than devm_regmap_init_spi. Good catch, thanks a lot.
Cheers, Samuel.
-- Intel Open Source Technology Centre http://oss.intel.com/
| |