Tony Lindgren <tony@xxxxxxxxxxx> writes:
> * Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> [110107 03:57]:
[...]
>> diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/arch/arm/plat-omap/include/plat/voltage.h
>> index 0ff1233..ffcdff9 100644
>> --- a/arch/arm/plat-omap/include/plat/voltage.h
>> +++ b/arch/arm/plat-omap/include/plat/voltage.h
>> @@ -14,6 +14,8 @@
>> #ifndef __ARCH_ARM_MACH_OMAP2_VOLTAGE_H
>> #define __ARCH_ARM_MACH_OMAP2_VOLTAGE_H
>>
>> +#include <linux/errno.h>
>> +
>> #define VOLTSCALE_VPFORCEUPDATE 1
>> #define VOLTSCALE_VCBYPASS 2
>
> This fix is already queued up by Kevin, but missing..
Yeah, the one in my queue uses <linux/err.h> because of usage of
ERR_PTR(), but fixes the same problem.
>> @@ -133,9 +135,9 @@ void omap_change_voltscale_method(struct voltagedomain *voltdm,
>> int voltscale_method);
>> int omap_voltage_late_init(void);
>> #else
>> -static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm,
>> +static inline void omap_voltage_register_pmic(struct voltagedomain *voltdm,
>> struct omap_volt_pmic_info *pmic_info) {}
>> -static inline void omap_change_voltscale_method(struct voltagedomain *voltdm,
>> +static inline void omap_change_voltscale_method(struct voltagedomain *voltdm,
>> int voltscale_method) {}
>> static inline int omap_voltage_late_init(void)
>> {
>
> ..this change.
And this is fixed in my queue as well, but differently. Instead of
changing to void, it keeps the int return value and returns -EINVAL.
Will be sending pull request for my queue of fixes shortly, after a
little more build/boot testing.
Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
