diff --git a/[refs] b/[refs] index e4be3331c994..3d4687bce33f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a1cefe857ae936d5a5f731eb301737139434580 +refs/heads/master: f8ccce20bfaeac648f44c24a140eda6e982239e1 diff --git a/trunk/drivers/staging/omap-thermal/omap-bandgap.c b/trunk/drivers/staging/omap-thermal/omap-bandgap.c index bff4b757c51a..f86c104df951 100644 --- a/trunk/drivers/staging/omap-thermal/omap-bandgap.c +++ b/trunk/drivers/staging/omap-thermal/omap-bandgap.c @@ -335,6 +335,8 @@ int omap_bandgap_add_hyst(struct omap_bandgap *bg_ptr, int adc_val, return ret; } +/*** Helper functions handling device Alert/Shutdown signals ***/ + /* Talert masks. Call it only if HAS(TALERT) is set */ static int temp_sensor_unmask_interrupts(struct omap_bandgap *bg_ptr, int id, u32 t_hot, u32 t_cold)