diff --git a/[refs] b/[refs] index 2b8f2aea6271..e19cd898b31e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7e08f1b8fcb85968c35ddecbf912bdab4cf2508 +refs/heads/master: dd361b6ff6de54f628e55a39b8667108589c74bf diff --git a/trunk/arch/arm/plat-omap/include/plat/voltage.h b/trunk/arch/arm/plat-omap/include/plat/voltage.h index 9943c667f8e1..4b02227e4098 100644 --- a/trunk/arch/arm/plat-omap/include/plat/voltage.h +++ b/trunk/arch/arm/plat-omap/include/plat/voltage.h @@ -65,9 +65,6 @@ struct voltagedomain { char *name; }; -/* API to get the voltagedomain pointer */ -struct voltagedomain *omap_voltage_domain_lookup(char *name); - /** * struct omap_volt_data - Omap voltage specific data. * @voltage_nominal: The possible voltage value in uV @@ -131,6 +128,9 @@ int omap_voltage_register_pmic(struct voltagedomain *voltdm, struct omap_volt_pmic_info *pmic_info); void omap_change_voltscale_method(struct voltagedomain *voltdm, int voltscale_method); +/* API to get the voltagedomain pointer */ +struct voltagedomain *omap_voltage_domain_lookup(char *name); + int omap_voltage_late_init(void); #else static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm, @@ -144,6 +144,10 @@ static inline int omap_voltage_late_init(void) { return -EINVAL; } +static inline struct voltagedomain *omap_voltage_domain_lookup(char *name) +{ + return ERR_PTR(-EINVAL); +} #endif #endif