diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 19:32:44 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 19:32:44 +0200 |
| commit | 86d91bab4806191a8126502d80d729c2a4765ebe (patch) | |
| tree | 1f5aa8a8566bc23db6b177117d1e53d3324602b5 | |
| parent | [PATCH] powerpc: irq change build breaks (diff) | |
| download | linux-86d91bab4806191a8126502d80d729c2a4765ebe.tar.xz linux-86d91bab4806191a8126502d80d729c2a4765ebe.zip | |
arch/i386/kernel/time: don't shadow 'irq' function arg
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | arch/i386/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index 3f221f5eb47e..78af572fd17c 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); |