From 30939676f72d8f09c3aaf71f0d64f13e36607a8f Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 16 Oct 2008 15:33:18 +0200
Subject: [PATCH] --- yaml --- r: 116553 b: refs/heads/master c:
 63d659d556f145d33798b8ad19ced10c254fe445 h: refs/heads/master i:   116551:
 fdc29992aafde23d3c8810493747810da18d058e v: v3

---
 [refs]                       | 2 +-
 trunk/kernel/irq/autoprobe.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index cd99e9ac2d36..1e3a2bd94172 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10e580842ec8e53dddf62e1ab1871f4906477376
+refs/heads/master: 63d659d556f145d33798b8ad19ced10c254fe445
diff --git a/trunk/kernel/irq/autoprobe.c b/trunk/kernel/irq/autoprobe.c
index 0cbff18efb6d..cc0f7321b8ce 100644
--- a/trunk/kernel/irq/autoprobe.c
+++ b/trunk/kernel/irq/autoprobe.c
@@ -161,7 +161,7 @@ EXPORT_SYMBOL(probe_irq_mask);
  */
 int probe_irq_off(unsigned long val)
 {
-	int i, irq_found = 0, nr_irqs = 0;
+	int i, irq_found = 0, nr_of_irqs = 0;
 	struct irq_desc *desc;
 	unsigned int status;
 
@@ -171,9 +171,9 @@ int probe_irq_off(unsigned long val)
 
 		if (status & IRQ_AUTODETECT) {
 			if (!(status & IRQ_WAITING)) {
-				if (!nr_irqs)
+				if (!nr_of_irqs)
 					irq_found = i;
-				nr_irqs++;
+				nr_of_irqs++;
 			}
 			desc->status = status & ~IRQ_AUTODETECT;
 			desc->chip->shutdown(i);
@@ -182,7 +182,7 @@ int probe_irq_off(unsigned long val)
 	}
 	mutex_unlock(&probing_active);
 
-	if (nr_irqs > 1)
+	if (nr_of_irqs > 1)
 		irq_found = -irq_found;
 
 	return irq_found;