From 781bc90a1d28d2002eb94abd6c23c823fdd3b268 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Thu, 14 May 2009 13:35:52 +0200
Subject: [PATCH] --- yaml --- r: 145119 b: refs/heads/master c:
 7b7210d7a9d260becef4dba98b9075e2c9b41f93 h: refs/heads/master i:   145117:
 25364399de20b4480695af900b7df9847d6bbf83   145115:
 a9f95ab31ff7db940c8809cf8127a452606db4d5   145111:
 62494fdb19ec893f342f5a9421c2feda8814fe3a   145103:
 9c1253712e280e00008329c8ce70e2b30e299b8a   145087:
 9e2be24d0ca2ee95993b429ce3c77c0e44c9b113 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/microblaze/kernel/intc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d4a7f80a7540..dc827231adde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3026589c1bc17b0c389b95afec127e92e2a745e2
+refs/heads/master: 7b7210d7a9d260becef4dba98b9075e2c9b41f93
diff --git a/trunk/arch/microblaze/kernel/intc.c b/trunk/arch/microblaze/kernel/intc.c
index a69d3e3c2fd4..b15605299a57 100644
--- a/trunk/arch/microblaze/kernel/intc.c
+++ b/trunk/arch/microblaze/kernel/intc.c
@@ -137,8 +137,8 @@ void __init init_IRQ(void)
 
 	intr_type =
 		*(int *) of_get_property(intc, "xlnx,kind-of-intr", NULL);
-	if (intr_type >= (1 << nr_irq))
-		printk(KERN_INFO " ERROR: Mishmash in king-of-intr param\n");
+	if (intr_type >= (1 << (nr_irq + 1)))
+		printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n");
 
 #ifdef CONFIG_SELFMOD_INTC
 	selfmod_function((int *) arr_func, intc_baseaddr);