From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 6 Oct 2006 17:32:44 +0000 (-0400)
Subject: arch/i386/kernel/time: don't shadow 'irq' function arg
X-Git-Tag: v2.6.19-rc2~227^2^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=86d91bab4806191a8126502d80d729c2a4765ebe;p=linux-2.6-omap-h63xx.git

arch/i386/kernel/time: don't shadow 'irq' function arg

Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 3f221f5eb47..78af572fd17 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -201,8 +201,8 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)
 		high bit of the PPI port B (0x61).  Note that some PS/2s,
 		notably the 55SX, work fine if this is removed.  */
 
-		irq = inb_p( 0x61 );	/* read the current state */
-		outb_p( irq|0x80, 0x61 );	/* reset the IRQ */
+		u8 irq_v = inb_p( 0x61 );	/* read the current state */
+		outb_p( irq_v|0x80, 0x61 );	/* reset the IRQ */
 	}
 
 	write_sequnlock(&xtime_lock);