diff options
Diffstat (limited to 'arch/x86_64/kernel/i8259.c')
-rw-r--r-- | arch/x86_64/kernel/i8259.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c index b2a238b5a17e..c6c9791d77c1 100644 --- a/arch/x86_64/kernel/i8259.c +++ b/arch/x86_64/kernel/i8259.c | |||
@@ -494,7 +494,7 @@ void invalidate_interrupt7(void); | |||
494 | void thermal_interrupt(void); | 494 | void thermal_interrupt(void); |
495 | void i8254_timer_resume(void); | 495 | void i8254_timer_resume(void); |
496 | 496 | ||
497 | static void setup_timer(void) | 497 | static void setup_timer_hardware(void) |
498 | { | 498 | { |
499 | outb_p(0x34,0x43); /* binary, mode 2, LSB/MSB, ch 0 */ | 499 | outb_p(0x34,0x43); /* binary, mode 2, LSB/MSB, ch 0 */ |
500 | udelay(10); | 500 | udelay(10); |
@@ -505,13 +505,13 @@ static void setup_timer(void) | |||
505 | 505 | ||
506 | static int timer_resume(struct sys_device *dev) | 506 | static int timer_resume(struct sys_device *dev) |
507 | { | 507 | { |
508 | setup_timer(); | 508 | setup_timer_hardware(); |
509 | return 0; | 509 | return 0; |
510 | } | 510 | } |
511 | 511 | ||
512 | void i8254_timer_resume(void) | 512 | void i8254_timer_resume(void) |
513 | { | 513 | { |
514 | setup_timer(); | 514 | setup_timer_hardware(); |
515 | } | 515 | } |
516 | 516 | ||
517 | static struct sysdev_class timer_sysclass = { | 517 | static struct sysdev_class timer_sysclass = { |
@@ -594,7 +594,7 @@ void __init init_IRQ(void) | |||
594 | * Set the clock to HZ Hz, we already have a valid | 594 | * Set the clock to HZ Hz, we already have a valid |
595 | * vector now: | 595 | * vector now: |
596 | */ | 596 | */ |
597 | setup_timer(); | 597 | setup_timer_hardware(); |
598 | 598 | ||
599 | if (!acpi_ioapic) | 599 | if (!acpi_ioapic) |
600 | setup_irq(2, &irq2); | 600 | setup_irq(2, &irq2); |