commit 70b99eff756e8995b607a9d33f242c1e4f480f32
author Linus Torvalds <torvalds@linux-foundation.org> Thu Nov 18 07:38:58 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Nov 18 07:38:58 2010 -0800
tree 23b62ad71f77f9cb44622d0be55ff3e4f7e55a00
parent 0a5b871ea4c6bfb2723ac2ffc7ef5c32452abb89
parent 0f6b77ca12bea571e0a97b0588f62aa5f6012d61

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Update a BKL related comment
  powerpc/mm: Fix module instruction tlb fault handling on Book-E 64
  powerpc: Fix call to subpage_protection()
  powerpc: Set CONFIG_32BIT on ppc32
  powerpc/mm: Fix build error in setup_initial_memory_limit
  powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG
  powerpc: Fix div64 in bootloader

include/linux/hardirq.h

diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index bea1612..714da7e 100644
--- a/include/linux/hardirq.h
+++ b/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>