From d0320d3b64981a273de3c664a8a9bdb039004e9a Mon Sep 17 00:00:00 2001
From: Eduardo Valentin <eduardo.valentin@ti.com>
Date: Fri, 15 Mar 2013 09:00:00 -0400
Subject: [PATCH] --- yaml --- r: 363463 b: refs/heads/master c:
 f230427c47d6e3f56286ebdefd2b5db25581ed5d h: refs/heads/master i:   363461:
 26fa6f0674f6f53ccc9ea62e5caab8c75d54d2e9   363459:
 484757135a56839e74d7f6d1b182d911efad1fd5   363455:
 391f64436943e0eaee0c8d80b0346cf2d81e57d5 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/omap-thermal/omap-bandgap.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 36b5a410d864..eae48e0975a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a6554ed29906be67082e26ac99cbbca9d2f9060
+refs/heads/master: f230427c47d6e3f56286ebdefd2b5db25581ed5d
diff --git a/trunk/drivers/staging/omap-thermal/omap-bandgap.c b/trunk/drivers/staging/omap-thermal/omap-bandgap.c
index 02817b54b456..1906ef19a47c 100644
--- a/trunk/drivers/staging/omap-thermal/omap-bandgap.c
+++ b/trunk/drivers/staging/omap-thermal/omap-bandgap.c
@@ -147,7 +147,7 @@ static u32 omap_bandgap_read_temp(struct omap_bandgap *bg_ptr, int id)
 }
 
 /* This is the Talert handler. Call it only if HAS(TALERT) is set */
-static irqreturn_t talert_irq_handler(int irq, void *data)
+static irqreturn_t omap_bandgap_talert_irq_handler(int irq, void *data)
 {
 	struct omap_bandgap *bg_ptr = data;
 	struct temp_sensor_registers *tsr;
@@ -750,7 +750,7 @@ static int omap_bandgap_talert_init(struct omap_bandgap *bg_ptr,
 		return bg_ptr->irq;
 	}
 	ret = request_threaded_irq(bg_ptr->irq, NULL,
-				   talert_irq_handler,
+				   omap_bandgap_talert_irq_handler,
 				   IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
 				   "talert", bg_ptr);
 	if (ret) {