Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/stub' into regulator-next

This commit is contained in:
Mark Brown 2014-12-05 11:14:43 +00:00
4 changed files with 17 additions and 43 deletions

View file

@ -288,7 +288,7 @@ devm_regulator_get(struct device *dev, const char *id)
static inline struct regulator *__must_check
regulator_get_exclusive(struct device *dev, const char *id)
{
return NULL;
return ERR_PTR(-ENODEV);
}
static inline struct regulator *__must_check