diff --git a/[refs] b/[refs] index 6b02c0ec5624..1e10afd376d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6e31629e335e8664a11be05992d39b2ee030960 +refs/heads/master: b169c908a51964822dc3aa828a3febb67933f1ac diff --git a/trunk/arch/mn10300/Kconfig b/trunk/arch/mn10300/Kconfig index 4638269152f6..243bfa23fd58 100644 --- a/trunk/arch/mn10300/Kconfig +++ b/trunk/arch/mn10300/Kconfig @@ -1,6 +1,7 @@ config MN10300 def_bool y select HAVE_OPROFILE + select GENERIC_HARDIRQS config AM33_2 def_bool n @@ -76,10 +77,6 @@ config QUICKLIST config ARCH_HAS_ILOG2_U32 def_bool y -# Use the generic interrupt handling code in kernel/irq/ -config GENERIC_HARDIRQS - def_bool y - config HOTPLUG_CPU def_bool n