From 882a8ad7bc60370bed936c2e39fdc737f53412ce Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 28 Oct 2010 11:30:31 +0900
Subject: [PATCH] --- yaml --- r: 221442 b: refs/heads/master c:
 4600d7c493f354a3e338a35bcf8a3bfbe815776a h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/irqnr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 79c2ee78aea1..1afa877559f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 639bd12f778d55a2632fde5af7d0719abc1871b9
+refs/heads/master: 4600d7c493f354a3e338a35bcf8a3bfbe815776a
diff --git a/trunk/include/linux/irqnr.h b/trunk/include/linux/irqnr.h
index 05aa8c23483f..3bc4dcab6e82 100644
--- a/trunk/include/linux/irqnr.h
+++ b/trunk/include/linux/irqnr.h
@@ -43,7 +43,7 @@ unsigned int irq_get_next_irq(unsigned int offset);
 		else
 
 #ifdef CONFIG_SMP
-#define irq_node(irq)	(irq_to_desc(irq)->node)
+#define irq_node(irq)	(irq_get_irq_data(irq)->node)
 #else
 #define irq_node(irq)	0
 #endif