---

yaml --- r: 363831 b: refs/heads/master c: 16b3973 h: refs/heads/master i: 363829: 96746df 363827: 218345d 363823: 73580b9 v: v3
git-mirror · Apr 1, 2013 · 6c343b4 · 6c343b4
1 parent 3bd48bf
commit 6c343b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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,