diff --git a/[refs] b/[refs] index 9cea605f8bc6..e07a8882fe2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f9c8d19d26e016de31d1e59a573913edc64ce5c +refs/heads/master: f0a7a5c93dfd1c0348dbbdb6f22cb82d99079c93 diff --git a/trunk/arch/i386/kernel/io_apic.c b/trunk/arch/i386/kernel/io_apic.c index 21db8f56c9a1..1bc4f7e4ed21 100644 --- a/trunk/arch/i386/kernel/io_apic.c +++ b/trunk/arch/i386/kernel/io_apic.c @@ -1902,7 +1902,7 @@ __setup("no_timer_check", notimercheck); * - if this function detects that timer IRQs are defunct, then we fall * back to ISA timer IRQs */ -int __init timer_irq_works(void) +static int __init timer_irq_works(void) { unsigned long t1 = jiffies;