diff --git a/[refs] b/[refs]
index 7062fceae366..842d470498df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f6b77ca12bea571e0a97b0588f62aa5f6012d61
+refs/heads/master: 70b99eff756e8995b607a9d33f242c1e4f480f32
diff --git a/trunk/include/linux/hardirq.h b/trunk/include/linux/hardirq.h
index bea1612d8f5c..714da7e5d10c 100644
--- a/trunk/include/linux/hardirq.h
+++ b/trunk/include/linux/hardirq.h
@@ -2,8 +2,6 @@
 #define LINUX_HARDIRQ_H
 
 #include <linux/preempt.h>
-#ifdef CONFIG_PREEMPT
-#endif
 #include <linux/lockdep.h>
 #include <linux/ftrace_irq.h>
 #include <asm/hardirq.h>