Merge tag 'stmp-dev' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[mirror_ubuntu-zesty-kernel.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 0e25c03939e31cf5db30a1731a69e40e6f019f4f..3e63af08908243be1f2bfc111e4356864802df3d 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -16,6 +16,9 @@ config BITREVERSE
 config RATIONAL
        boolean
 
+config GENERIC_STRNCPY_FROM_USER
+       bool
+
 config GENERIC_FIND_FIRST_BIT
        bool
 
@@ -33,6 +36,9 @@ config GENERIC_IO
        boolean
        default n
 
+config STMP_DEVICE
+       bool
+
 config CRC_CCITT
        tristate "CRC-CCITT functions"
        help