]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3d67897) | patch
mfd: Fix mc13xxx-spi merge conflict
authorAxel Lin <axel.lin@gmail.com>
Mon, 2 Jul 2012 08:03:00 +0000 (16:03 +0800)
committerSamuel Ortiz <sameo@linux.intel.com>
Sun, 8 Jul 2012 22:16:13 +0000 (00:16 +0200)
commitcd1f0d2ca6e92907386aad6f98a9fdafa46a3b62
tree04a8f0d84bdfd9c787bc1a28add9ccb4f3291da4tree | snapshot
parent3d67897254b53cc7e7cca36cf5a94e276db57600commit | 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>
drivers/mfd/mc13xxx-spi.c diff | blob | history
Linux Kernel Source Tree.