From: Andrew Morton namespace clash. Please grep the rest of the tree, send fixes? Cc: Oleg Nesterov Signed-off-by: Andrew Morton --- arch/x86_64/kernel/i8259.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/x86_64/kernel/i8259.c~introduce-setup_timer-helper-x86_64-fix arch/x86_64/kernel/i8259.c --- 25/arch/x86_64/kernel/i8259.c~introduce-setup_timer-helper-x86_64-fix 2005-09-21 15:55:06.000000000 -0700 +++ 25-akpm/arch/x86_64/kernel/i8259.c 2005-09-21 15:55:40.000000000 -0700 @@ -495,7 +495,7 @@ void thermal_interrupt(void); void threshold_interrupt(void); void i8254_timer_resume(void); -static void setup_timer(void) +static void setup_timer_hardware(void) { outb_p(0x34,0x43); /* binary, mode 2, LSB/MSB, ch 0 */ udelay(10); @@ -506,13 +506,13 @@ static void setup_timer(void) static int timer_resume(struct sys_device *dev) { - setup_timer(); + setup_timer_hardware(); return 0; } void i8254_timer_resume(void) { - setup_timer(); + setup_timer_hardware(); } static struct sysdev_class timer_sysclass = { @@ -596,7 +596,7 @@ void __init init_IRQ(void) * Set the clock to HZ Hz, we already have a valid * vector now: */ - setup_timer(); + setup_timer_hardware(); if (!acpi_ioapic) setup_irq(2, &irq2); _