From 3ac99ba13bd3c7ea3362174ce4235fd6b4cdb903 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Wed, 25 Jul 2012 15:05:32 +0300
Subject: [PATCH] --- yaml --- r: 324317 b: refs/heads/master c:
 73f2989d37a36614fe13f24891ebe1e44fe5887d h: refs/heads/master i:   324315:
 4f793995546eeef45811d59c710626757c786bfc v: v3

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

diff --git a/[refs] b/[refs]
index 7d181dd65c8a..b6fc8af13f64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 042a713fa4369ffc2fcb2f93400bc862a04a1f0f
+refs/heads/master: 73f2989d37a36614fe13f24891ebe1e44fe5887d
diff --git a/trunk/drivers/w1/masters/Kconfig b/trunk/drivers/w1/masters/Kconfig
index 5ceb1cd50195..7e984034a11b 100644
--- a/trunk/drivers/w1/masters/Kconfig
+++ b/trunk/drivers/w1/masters/Kconfig
@@ -60,7 +60,6 @@ config W1_MASTER_GPIO
 
 config HDQ_MASTER_OMAP
 	tristate "OMAP HDQ driver"
-	depends on ARCH_OMAP2PLUS
 	help
 	  Say Y here if you want support for the 1-wire or HDQ Interface
 	  on an OMAP processor.
diff --git a/trunk/drivers/w1/masters/omap_hdq.c b/trunk/drivers/w1/masters/omap_hdq.c
index c8a44642a5f1..ca8e60bb2f9c 100644
--- a/trunk/drivers/w1/masters/omap_hdq.c
+++ b/trunk/drivers/w1/masters/omap_hdq.c
@@ -18,9 +18,6 @@
 #include <linux/sched.h>
 #include <linux/pm_runtime.h>
 
-#include <asm/irq.h>
-#include <mach/hardware.h>
-
 #include "../w1.h"
 #include "../w1_int.h"