Merge branch 'master' into for-next

[~andy/linux] / arch / um / Kconfig.common

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 109ddc0071c6ae214b762b848506b49bf846258c..a9234838e8a29826ea947beaef7bf493bba49c40 100644 (file)
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -7,7 +7,6 @@ config UML
        bool
        default y
        select HAVE_GENERIC_HARDIRQS
-       select GENERIC_HARDIRQS_NO_DEPRECATED
        select GENERIC_IRQ_SHOW
 
 config MMU