Hello Stephen,
On Wed, Sep 12, 2012 at 8:52 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/omap-thermal/omap-thermal-common.c between commit
> 76f726fb24bd ("Thermal: Remove tc1/tc2 in generic thermal layer") from
> the thermal tree and commit 765a1939a364 ("staging: omap-thermal: fix
> polling period settings") from the staging tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
Just to confirm that the fix is correct.
>
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
>
> diff --cc drivers/staging/omap-thermal/omap-thermal-common.c
> index b4cd6cc,46ee0a9..0000000
> --- a/drivers/staging/omap-thermal/omap-thermal-common.c
> +++ b/drivers/staging/omap-thermal/omap-thermal-common.c
> @@@ -248,7 -268,9 +270,8 @@@ int omap_thermal_expose_sensor(struct o
> /* Create thermal zone */
> data->omap_thermal = thermal_zone_device_register(domain,
> OMAP_TRIP_NUMBER, 0, data, &omap_thermal_ops,
> - 0, FAST_TEMP_MONITORING_RATE);
> - 1, 2, /*TODO: remove this when FW allows */
> + FAST_TEMP_MONITORING_RATE,
> + FAST_TEMP_MONITORING_RATE);
> if (IS_ERR_OR_NULL(data->omap_thermal)) {
> dev_err(bg_ptr->dev, "thermal zone device is NULL\n");
> return PTR_ERR(data->omap_thermal);
--
Eduardo Valentin
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
