From 97bf9d7e7d34772814300ef2bf4842d452aa74ca Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Nov 2010 18:36:25 -0800
Subject: [PATCH] --- yaml --- r: 222188 b: refs/heads/master c:
 0a5b871ea4c6bfb2723ac2ffc7ef5c32452abb89 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/hardirq.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2c0ae1efbee6..2f2308668486 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7957f0a857754c555e07f58a3fb83ac29501478c
+refs/heads/master: 0a5b871ea4c6bfb2723ac2ffc7ef5c32452abb89
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>