From 6c343b4813b86381a403202bddabd9fd658e8fe5 Mon Sep 17 00:00:00 2001 From: J Keerthy Date: Mon, 1 Apr 2013 12:04:41 -0400 Subject: [PATCH] --- yaml --- r: 363831 b: refs/heads/master c: 16b39738f9ae2acc50dc82d5259be37d575eb3c2 h: refs/heads/master i: 363829: 96746df3972767540e5391ae99492bdaf5d7d54a 363827: 218345da6c6c021e86be6420b4916ea94cb35922 363823: 73580b9666f310bf80cb46cbe8ca4c26795b2c0c v: v3 --- [refs] | 2 +- trunk/drivers/staging/ti-soc-thermal/omap5-thermal-data.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a135f127dc33..faf0c9a30340 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ff027f1b7fa36e9591d86700bbf91ef4fe96db8 +refs/heads/master: 16b39738f9ae2acc50dc82d5259be37d575eb3c2 diff --git a/trunk/drivers/staging/ti-soc-thermal/omap5-thermal-data.c b/trunk/drivers/staging/ti-soc-thermal/omap5-thermal-data.c index a5fa1139fac0..460a3b25aefb 100644 --- a/trunk/drivers/staging/ti-soc-thermal/omap5-thermal-data.c +++ b/trunk/drivers/staging/ti-soc-thermal/omap5-thermal-data.c @@ -318,7 +318,8 @@ omap5430_adc_to_temp[ const struct ti_bandgap_data omap5430_data = { .features = TI_BANDGAP_FEATURE_TSHUT_CONFIG | TI_BANDGAP_FEATURE_FREEZE_BIT | - TI_BANDGAP_FEATURE_TALERT, + TI_BANDGAP_FEATURE_TALERT | + TI_BANDGAP_FEATURE_COUNTER_DELAY, .fclock_name = "l3instr_ts_gclk_div", .div_ck_name = "l3instr_ts_gclk_div", .conv_table = omap5430_adc_to_temp,