Commit 7ada1dd6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

One small bug fix from Axel plus a fix for a build failure in unrealistic
but commonly built configs which for some reason manage to survive for
an awfully long time in -next without any reports.

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Fix getting voltage in max8649_enable_time()
  regulator: Fix mc13xxx regulator modular build (again)
parents ebf4bcbd 9fc886a1

drivers/regulator/max8649.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -150,7 +150,7 @@ static int max8649_enable_time(struct regulator_dev *rdev) 
	if (ret != 0)

	if (ret != 0)

		return ret;

		return ret;

	val &= MAX8649_VOL_MASK;

	val &= MAX8649_VOL_MASK;

	voltage = max8649_list_voltage(rdev, (unsigned char)ret); /* uV */

	voltage = max8649_list_voltage(rdev, (unsigned char)val); /* uV */





	/* get rate */

	/* get rate */

	ret = regmap_read(info->regmap, MAX8649_RAMP, &val);

	ret = regmap_read(info->regmap, MAX8649_RAMP, &val);

drivers/regulator/mc13xxx-regulator-core.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -254,6 +254,7 @@ int __devinit mc13xxx_get_num_regulators_dt(struct platform_device *pdev) 




	return num;

	return num;

}

}

EXPORT_SYMBOL_GPL(mc13xxx_get_num_regulators_dt);





struct mc13xxx_regulator_init_data * __devinit mc13xxx_parse_regulators_dt(

struct mc13xxx_regulator_init_data * __devinit mc13xxx_parse_regulators_dt(

	struct platform_device *pdev, struct mc13xxx_regulator *regulators,

	struct platform_device *pdev, struct mc13xxx_regulator *regulators,
@@ -291,6 +292,7 @@ struct mc13xxx_regulator_init_data * __devinit mc13xxx_parse_regulators_dt( 




	return data;

	return data;

}

}

EXPORT_SYMBOL_GPL(mc13xxx_parse_regulators_dt);

#endif

#endif





MODULE_LICENSE("GPL v2");

MODULE_LICENSE("GPL v2");