ARM: mxs: spl_power_init: fix merge error leading to "redefinition of 'mxs_init_batt_...