diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-07-02 16:03:00 +0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-07-09 00:16:13 +0200 |
| commit | e03088972f6e38e90077eaf09acf7b8a327a2da2 (patch) | |
| tree | 04a8f0d84bdfd9c787bc1a28add9ccb4f3291da4 /drivers/mfd/adp5520.c | |
| parent | 2761a63945164ef111062828858a80225222ecd7 (diff) | |
| download | linux-stable-e03088972f6e38e90077eaf09acf7b8a327a2da2.tar.gz linux-stable-e03088972f6e38e90077eaf09acf7b8a327a2da2.tar.bz2 linux-stable-e03088972f6e38e90077eaf09acf7b8a327a2da2.zip | |
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>
Diffstat (limited to 'drivers/mfd/adp5520.c')
0 files changed, 0 insertions, 0 deletions