diff options
| author |  Anton Vorontsov <anton@enomsg.org>
| 2013-01-05 17:14:22 -0800 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org>
| 2013-01-05 17:14:22 -0800 |
| commit | 240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983 (patch) | |
| tree | 8481027b056197db888e51eae47a8f95931b84cb /drivers/mfd/ab8500-core.c | |
| parent | charger_manager: Don't use [delayed_]work_pending() (diff) | |
| parent | ab8500_bm: Make the battery Device Tree node reference less cryptic (diff) | |
| download | linux-240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983.tar.gz linux-240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983.tar.bz2 linux-240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983.zip | |
Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500
Diffstat (limited to 'drivers/mfd/ab8500-core.c')
| -rw-r--r-- | drivers/mfd/ab8500-core.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index e1650badd106..30b92652fce9 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c @@ -1011,40 +1011,32 @@ static struct mfd_cell ab8500_bm_devs[] = { .of_compatible = "stericsson,ab8500-charger", .num_resources = ARRAY_SIZE(ab8500_charger_resources), .resources = ab8500_charger_resources, -#ifndef CONFIG_OF .platform_data = &ab8500_bm_data, .pdata_size = sizeof(ab8500_bm_data), -#endif }, { .name = "ab8500-btemp", .of_compatible = "stericsson,ab8500-btemp", .num_resources = ARRAY_SIZE(ab8500_btemp_resources), .resources = ab8500_btemp_resources, -#ifndef CONFIG_OF .platform_data = &ab8500_bm_data, .pdata_size = sizeof(ab8500_bm_data), -#endif }, { .name = "ab8500-fg", .of_compatible = "stericsson,ab8500-fg", .num_resources = ARRAY_SIZE(ab8500_fg_resources), .resources = ab8500_fg_resources, -#ifndef CONFIG_OF .platform_data = &ab8500_bm_data, .pdata_size = sizeof(ab8500_bm_data), -#endif }, { .name = "ab8500-chargalg", .of_compatible = "stericsson,ab8500-chargalg", .num_resources = ARRAY_SIZE(ab8500_chargalg_resources), .resources = ab8500_chargalg_resources, -#ifndef CONFIG_OF .platform_data = &ab8500_bm_data, .pdata_size = sizeof(ab8500_bm_data), -#endif }, }; |