diff --git a/[refs] b/[refs] index 1e20d2cb6f50..26af007c4e68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac5c3e47a27e1ceecbed2b6809dcd78105cb3df5 +refs/heads/master: c1989bec03f7a6b41377efca88aa44b966c318f4 diff --git a/trunk/drivers/staging/omap-thermal/omap5-thermal.c b/trunk/drivers/staging/omap-thermal/omap5-thermal.c index c8c3e6e735e3..63063600f058 100644 --- a/trunk/drivers/staging/omap-thermal/omap5-thermal.c +++ b/trunk/drivers/staging/omap-thermal/omap5-thermal.c @@ -319,10 +319,7 @@ omap5430_adc_to_temp[ /* TODO : Need to update the slope/constant for ES2.0 silicon */ const struct omap_bandgap_data omap5430_data = { .features = OMAP_BANDGAP_FEATURE_TSHUT_CONFIG | - OMAP_BANDGAP_FEATURE_TALERT | - OMAP_BANDGAP_FEATURE_MODE_CONFIG | - OMAP_BANDGAP_FEATURE_COUNTER | - OMAP_BANDGAP_FEATURE_CLK_CTRL, + OMAP_BANDGAP_FEATURE_TALERT, .fclock_name = "l3instr_ts_gclk_div", .div_ck_name = "l3instr_ts_gclk_div", .conv_table = omap5430_adc_to_temp,