diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 15:27:31 -0400 |
| commit | 5d347c8abaab1e8c24272a53099c22482855783e (patch) | |
| tree | 3e267ced787b4ae18dd2c6275c1b8a83884f96b6 /arch | |
| parent | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff) | |
| parent | d87dbede030d17770aa6a6170e70ab6f8044e5ae (diff) | |
Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups
Diffstat (limited to 'arch')
| -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) | |||
| 201 | high bit of the PPI port B (0x61). Note that some PS/2s, | 201 | high bit of the PPI port B (0x61). Note that some PS/2s, |
| 202 | notably the 55SX, work fine if this is removed. */ | 202 | notably the 55SX, work fine if this is removed. */ |
| 203 | 203 | ||
| 204 | irq = inb_p( 0x61 ); /* read the current state */ | 204 | u8 irq_v = inb_p( 0x61 ); /* read the current state */ |
| 205 | outb_p( irq|0x80, 0x61 ); /* reset the IRQ */ | 205 | outb_p( irq_v|0x80, 0x61 ); /* reset the IRQ */ |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | write_sequnlock(&xtime_lock); | 208 | write_sequnlock(&xtime_lock); |