| commit | e03088972f6e38e90077eaf09acf7b8a327a2da2 | [log] [tgz] |
|---|---|---|
| author | Axel Lin <axel.lin@gmail.com> | Mon Jul 02 16:03:00 2012 +0800 |
| committer | Samuel Ortiz <sameo@linux.intel.com> | Mon Jul 09 00:16:13 2012 +0200 |
| tree | 04a8f0d84bdfd9c787bc1a28add9ccb4f3291da4 | |
| parent | 2761a63945164ef111062828858a80225222ecd7 [diff] |
mfd: Fix mc13xxx-spi merge conflict 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. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>