Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 7 deletions

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 7c8e277f6d34..a9234838e8a2 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -3,14 +3,11 @@ config DEFCONFIG_LIST
         option defconfig_list
         default "arch/$ARCH/defconfig"
 
-# UML uses the generic IRQ subsystem
-config GENERIC_HARDIRQS
-        bool
-        default y
-
 config UML
         bool
         default y
+        select HAVE_GENERIC_HARDIRQS
+        select GENERIC_IRQ_SHOW
 
 config MMU
         bool
@@ -19,8 +16,6 @@ config MMU
 config NO_IOMEM
         def_bool y
 
-mainmenu "Linux/Usermode Kernel Configuration"
-
 config ISA
         bool