Merge tag 'for-linus-20171120' of git://git.infradead.org/linux-mtd

[sfrench/cifs-2.6.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index b1445b22a6def496d91bde16deb2b13a01a52915..c5e84fbcb30b7562656dcbbc050bcc0ec4cb7a90 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -46,10 +46,6 @@ config GENERIC_IOMAP
        bool
        select GENERIC_PCI_IOMAP
 
-config GENERIC_IO
-       bool
-       default n
-
 config STMP_DEVICE
        bool
 
@@ -584,6 +580,24 @@ config PRIME_NUMBERS
        tristate
 
 config STRING_SELFTEST
-       bool "Test string functions"
+       tristate "Test string functions"
 
 endmenu
+
+config GENERIC_ASHLDI3
+       bool
+
+config GENERIC_ASHRDI3
+       bool
+
+config GENERIC_LSHRDI3
+       bool
+
+config GENERIC_MULDI3
+       bool
+
+config GENERIC_CMPDI2
+       bool
+
+config GENERIC_UCMPDI2
+       bool