From f801c9db43053466842ad5f39e2024124948c0a9 Mon Sep 17 00:00:00 2001
From: Jamie Iles <jamie@jamieiles.com>
Date: Wed, 14 Dec 2011 23:43:16 +0100
Subject: [PATCH] --- yaml --- r: 279925 b: refs/heads/master c:
 c87fb57346fc7653ace98769f148e0dcd88ac1ee h: refs/heads/master i:   279923:
 364d0e236729e71665174d22f072de3af3f8d8ec v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/irqdomain.h |  3 ++-
 trunk/kernel/irq/irqdomain.c    | 12 +++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a7f8c55e8f97..59f1fd18a60b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df0bcfe0f811a73077c06f75e440397e89ba58a4
+refs/heads/master: c87fb57346fc7653ace98769f148e0dcd88ac1ee
diff --git a/trunk/include/linux/irqdomain.h b/trunk/include/linux/irqdomain.h
index 99834e581b9e..bd4272b61a14 100644
--- a/trunk/include/linux/irqdomain.h
+++ b/trunk/include/linux/irqdomain.h
@@ -91,10 +91,11 @@ static inline unsigned int irq_domain_to_irq(struct irq_domain *d,
 
 extern void irq_domain_add(struct irq_domain *domain);
 extern void irq_domain_del(struct irq_domain *domain);
+
+extern struct irq_domain_ops irq_domain_simple_ops;
 #endif /* CONFIG_IRQ_DOMAIN */
 
 #if defined(CONFIG_IRQ_DOMAIN) && defined(CONFIG_OF_IRQ)
-extern struct irq_domain_ops irq_domain_simple_ops;
 extern void irq_domain_add_simple(struct device_node *controller, int irq_base);
 extern void irq_domain_generate_simple(const struct of_device_id *match,
 					u64 phys_base, unsigned int irq_start);
diff --git a/trunk/kernel/irq/irqdomain.c b/trunk/kernel/irq/irqdomain.c
index 200ce832c585..7ca523b249ef 100644
--- a/trunk/kernel/irq/irqdomain.c
+++ b/trunk/kernel/irq/irqdomain.c
@@ -143,11 +143,6 @@ int irq_domain_simple_dt_translate(struct irq_domain *d,
 	return 0;
 }
 
-struct irq_domain_ops irq_domain_simple_ops = {
-	.dt_translate = irq_domain_simple_dt_translate,
-};
-EXPORT_SYMBOL_GPL(irq_domain_simple_ops);
-
 /**
  * irq_domain_create_simple() - Set up a 'simple' translation range
  */
@@ -182,3 +177,10 @@ void irq_domain_generate_simple(const struct of_device_id *match,
 }
 EXPORT_SYMBOL_GPL(irq_domain_generate_simple);
 #endif /* CONFIG_OF_IRQ */
+
+struct irq_domain_ops irq_domain_simple_ops = {
+#ifdef CONFIG_OF_IRQ
+	.dt_translate = irq_domain_simple_dt_translate,
+#endif /* CONFIG_OF_IRQ */
+};
+EXPORT_SYMBOL_GPL(irq_domain_simple_ops);