Axel Lin e03088972f
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>
2012-07-09 00:16:13 +02:00
2012-06-30 11:11:58 -07:00
2012-05-26 12:22:27 -07:00
2012-06-20 14:39:36 -07:00
2012-05-24 16:22:53 -04:00
2012-06-24 23:31:09 +02:00
2012-06-08 13:47:07 -04:00
2012-07-03 15:51:22 -07:00
2012-06-19 00:19:11 -03:00
2012-06-18 12:20:36 -07:00
2012-07-03 12:05:14 -07:00
2012-06-11 17:10:16 +09:00
2012-05-26 12:42:29 -07:00
2012-05-23 14:07:06 -07:00
2012-06-20 22:12:52 -07:00
2012-06-11 12:43:16 -03:00
2012-06-18 16:30:42 -07:00
2012-05-24 12:57:47 -07:00
2012-06-03 21:21:01 -07:00
2012-07-03 11:18:48 +01:00
2012-06-26 11:23:41 -07:00
2012-05-22 16:02:13 -07:00
2012-06-29 10:29:54 -07:00
2012-06-04 16:49:43 +02:00
2012-06-12 15:51:41 -07:00
2012-05-16 15:17:08 -04:00
2012-06-14 17:28:46 -07:00
2012-06-24 04:59:59 -07:00
2012-07-06 09:50:39 -07:00
2012-06-04 12:47:44 +02:00
2012-05-24 11:54:29 -07:00
2012-07-04 15:55:19 +08:00
2012-07-03 18:05:35 -07:00
2012-06-25 14:53:09 -07:00
2012-05-31 18:10:18 -07:00
2012-07-09 00:16:13 +02:00
2012-06-13 15:34:31 -07:00
2012-06-26 16:10:30 -04:00
2012-07-06 10:34:48 -07:00
2012-07-01 00:25:32 -07:00
2012-05-25 11:16:16 -04:00
2012-06-14 20:29:40 -05:00
2012-06-21 16:15:11 +02:00
2012-05-22 19:22:50 -07:00
2012-05-22 16:02:13 -07:00
2012-06-13 13:11:39 -07:00
2012-06-20 14:41:57 -07:00
2012-06-07 14:43:55 -07:00
2012-05-31 12:10:15 -07:00
2012-05-22 19:22:50 -07:00
2012-05-31 17:49:31 -07:00
2012-07-09 00:16:09 +02:00
2012-06-17 10:31:03 +03:00
2012-07-09 00:16:10 +02:00
2012-05-31 10:51:10 -07:00
2012-07-06 13:59:50 -07:00
2012-05-22 19:07:55 +09:00
2012-06-18 11:27:04 +01:00
2012-05-16 12:46:37 -04:00
2012-06-25 14:53:09 -07:00
2012-07-06 12:52:09 -07:00
2012-06-20 15:13:13 -07:00
2012-07-09 00:16:12 +02:00
2012-06-26 21:10:56 -07:00
2012-06-16 16:59:05 -07:00
2012-05-22 12:16:15 +09:30
2012-05-26 12:42:29 -07:00
2012-06-28 20:40:56 +02:00
2012-06-15 17:17:15 -07:00
2012-05-22 16:34:21 -07:00
2012-05-26 12:22:27 -07:00
e03088972f