Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...

[karo-tx-linux.git] / arch / h8300 / Kconfig

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 65f897d8c1e97b428f572bd4d777f3f0d9ea7aa0..9624db193e3cef301598f0c56e545c9f6d2fe7a4 100644 (file)
--- 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
@@ -43,11 +45,11 @@ config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
-config GENERIC_HWEIGHT
+config GENERIC_FIND_BIT_LE
        bool
        default y
 
-config GENERIC_HARDIRQS
+config GENERIC_HWEIGHT
        bool
        default y