diff --git a/[refs] b/[refs]
index 5781fa73902f..bce7af71a105 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02c1df199c990cd21c09a4dffaa06d4e0b7bf2bf
+refs/heads/master: b558cb35f1ef92837cba0fba9aad267e5eff1f65
diff --git a/trunk/init/dyn_array.c b/trunk/init/dyn_array.c
index 1dc08140f3cb..cf1e04c83b33 100644
--- a/trunk/init/dyn_array.c
+++ b/trunk/init/dyn_array.c
@@ -54,7 +54,7 @@ void __init pre_alloc_dyn_array(void)
 			da->init_work(da);
 	}
 #else
-#ifdef CONFIF_GENERIC_HARDIRQS
+#ifdef CONFIG_GENERIC_HARDIRQS
 	unsigned int i;
 
 	for (i = 0; i < NR_IRQS; i++)
@@ -117,9 +117,8 @@ void __init per_cpu_alloc_dyn_array(int cpu, char *ptr)
 
 		phys += size;
 
-		if (da->init_work) {
+		if (da->init_work)
 			da->init_work(da);
-		}
 	}
 #endif
 }