Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500

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
         },
 };