diff --git a/[refs] b/[refs] index 63600c31d630..bd7f9a3a5913 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da28d966f6aa942ae836d09729f76a1647932309 +refs/heads/master: f5b6d45f8cf688f51140fd21f1da3b90562762a9 diff --git a/trunk/drivers/thermal/rcar_thermal.c b/trunk/drivers/thermal/rcar_thermal.c index 909bb4bb837f..28f091994013 100644 --- a/trunk/drivers/thermal/rcar_thermal.c +++ b/trunk/drivers/thermal/rcar_thermal.c @@ -476,7 +476,7 @@ static int rcar_thermal_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id rcar_thermal_dt_ids[] __devinitconst = { +static const struct of_device_id rcar_thermal_dt_ids[] = { { .compatible = "renesas,rcar-thermal", }, {}, };