diff --git a/[refs] b/[refs]
index 634a0aeff9e6..2fddc237bbe2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bee5ab3f572d9499c42e75b958ff7309ff830a13
+refs/heads/master: 23f9b317e0ba4fbc5fc9524275d0105fa87e2027
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index c516382fbec2..f04ba20712a2 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/include/linux/irq.h
@@ -10,7 +10,7 @@
  */
 
 #include <linux/config.h>
-#include <asm/smp.h>		/* cpu_online_map */
+#include <linux/smp.h>
 
 #if !defined(CONFIG_ARCH_S390)