From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 2 Jul 2012 08:03:00 +0000 (+0800)
Subject: mfd: Fix mc13xxx-spi merge conflict
X-Git-Tag: v3.6-rc1~47^2~71
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e03088972f6e38e90077eaf09acf7b8a327a2da2;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed