diff --git a/[refs] b/[refs]
index 6b74cc4c4376..4fbea6c697ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40413dcb7b273bda681dca38e6ff0bbb3728ef11
+refs/heads/master: 1267a8df209c7453d65acbdd56e3588954bf890b
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index cd0cd8dcb345..618a64f1915a 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -15,7 +15,7 @@
 
 #include "internals.h"
 
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
 cpumask_var_t irq_default_affinity;
 
 static int init_irq_default_affinity(void)