From 8cc92b2512329fe262334adc204a4d3740cc3ce4 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Fri, 7 Sep 2012 12:53:15 -0700
Subject: [PATCH] --- yaml --- r: 326513 b: refs/heads/master c:
 aefaf7be498b9cfbd16e42932cdc52ab334241e0 h: refs/heads/master i:   326511:
 18e1c831240c8331c23ca73418e23e75f4d72f50 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/w1/masters/omap_hdq.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d4990dd2d5c1..c7b2abaa563d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f799a3d8fe170159257b75c1baf48a7c1f625d1d
+refs/heads/master: aefaf7be498b9cfbd16e42932cdc52ab334241e0
diff --git a/trunk/drivers/w1/masters/omap_hdq.c b/trunk/drivers/w1/masters/omap_hdq.c
index 4b0fcf3c2d03..fee195a76941 100644
--- a/trunk/drivers/w1/masters/omap_hdq.c
+++ b/trunk/drivers/w1/masters/omap_hdq.c
@@ -19,7 +19,6 @@
 #include <linux/pm_runtime.h>
 
 #include <asm/irq.h>
-#include <mach/hardware.h>
 
 #include "../w1.h"
 #include "../w1_int.h"
@@ -644,7 +643,7 @@ static int omap_hdq_remove(struct platform_device *pdev)
 
 	/* remove module dependency */
 	pm_runtime_disable(&pdev->dev);
-	free_irq(INT_24XX_HDQ_IRQ, hdq_data);
+	free_irq(platform_get_irq(pdev, 0), hdq_data);
 	platform_set_drvdata(pdev, NULL);
 	iounmap(hdq_data->hdq_base);
 	kfree(hdq_data);