Merge commit 'v2.6.38-rc2' into topic/misc

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 65f897d8c1e9..6df692d1475f 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -2,6 +2,8 @@ config H8300
         bool
         default y
         select HAVE_IDE
+        select HAVE_GENERIC_HARDIRQS
+        select GENERIC_HARDIRQS_NO_DEPRECATED
 
 config SYMBOL_PREFIX
         string
@@ -47,10 +49,6 @@ config GENERIC_HWEIGHT
         bool
         default y
 
-config GENERIC_HARDIRQS
-        bool
-        default y
-
 config GENERIC_CALIBRATE_DELAY
         bool
         default y