diff --git a/[refs] b/[refs]
index f6bd019a417c..b414dd2c502f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bc471d93051a19545257909bc2ed2ad3b389b54
+refs/heads/master: 97e7b6f54c0d66586a658e985630cd63040311fb
diff --git a/trunk/include/asm-x86/hw_irq.h b/trunk/include/asm-x86/hw_irq.h
index a8c5e8bdaa49..cdb09d77af03 100644
--- a/trunk/include/asm-x86/hw_irq.h
+++ b/trunk/include/asm-x86/hw_irq.h
@@ -67,6 +67,10 @@ extern void print_IO_APIC(void);
 extern int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn);
 extern void setup_ioapic_dest(void);
 
+#ifdef CONFIG_X86_64
+extern void enable_IO_APIC(void);
+#endif
+
 /* IPI functions */
 extern void send_IPI_self(int vector);
 extern void send_IPI(int dest, int vector);
diff --git a/trunk/include/asm-x86/hw_irq_64.h b/trunk/include/asm-x86/hw_irq_64.h
index 9305f7456a7f..428785b3634b 100644
--- a/trunk/include/asm-x86/hw_irq_64.h
+++ b/trunk/include/asm-x86/hw_irq_64.h
@@ -12,9 +12,6 @@ extern spinlock_t vector_lock;
  * Interrupt entry/exit code at both C and assembly level
  */
 
-extern void enable_IO_APIC(void);
-extern void native_init_IRQ(void);
-
 #include <asm/ptrace.h>
 
 #endif
diff --git a/trunk/include/asm-x86/irq_64.h b/trunk/include/asm-x86/irq_64.h
index 3037ec667bfb..1ef233d15dc4 100644
--- a/trunk/include/asm-x86/irq_64.h
+++ b/trunk/include/asm-x86/irq_64.h
@@ -27,4 +27,6 @@ extern void fixup_irqs(cpumask_t map);
 
 #define __ARCH_HAS_DO_SOFTIRQ 1
 
+extern void native_init_IRQ(void);
+
 #endif /* _ASM_IRQ_H */