diff --git a/[refs] b/[refs] index 8713c4422a2d..ac2ebdc0e126 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c014c841e665e9705a12488666c73af0ad52a7a +refs/heads/master: 67b4c474228fd8a451377615046d4048aee89c3c diff --git a/trunk/drivers/staging/ti-soc-thermal/ti-thermal-common.c b/trunk/drivers/staging/ti-soc-thermal/ti-thermal-common.c index 092b39d15d2e..18f6fb90230e 100644 --- a/trunk/drivers/staging/ti-soc-thermal/ti-thermal-common.c +++ b/trunk/drivers/staging/ti-soc-thermal/ti-thermal-common.c @@ -124,9 +124,9 @@ static int ti_thermal_bind(struct thermal_zone_device *thermal, id = data->sensor_id; - /* TODO: bind with min and max states */ /* Simple thing, two trips, one passive another critical */ return thermal_zone_bind_cooling_device(thermal, 0, cdev, + /* bind with min and max states defined by cpu_cooling */ THERMAL_NO_LIMIT, THERMAL_NO_LIMIT); }