Merge commit 'v3.5-rc2' into next

[firefly-linux-kernel-4.4.55.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index ac9d8d31c4a68a9fb66524c41b1885926ca7115e..8269d56dcdaa38a2af895777bfb1a2d873df5f84 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -16,6 +16,12 @@ config BITREVERSE
 config RATIONAL
        boolean
 
+config GENERIC_STRNCPY_FROM_USER
+       bool
+
+config GENERIC_STRNLEN_USER
+       bool
+
 config GENERIC_FIND_FIRST_BIT
        bool
 
@@ -33,6 +39,9 @@ config GENERIC_IO
        boolean
        default n
 
+config STMP_DEVICE
+       bool
+
 config CRC_CCITT
        tristate "CRC-CCITT functions"
        help
@@ -353,6 +362,14 @@ config CORDIC
          This option provides an implementation of the CORDIC algorithm;
          calculations are in fixed point. Module will be called cordic.
 
+config DDR
+       bool "JEDEC DDR data"
+       help
+         Data from JEDEC specs for DDR SDRAM memories,
+         particularly the AC timing parameters and addressing
+         information. This data is useful for drivers handling
+         DDR SDRAM controllers.
+
 config MPILIB
        tristate
        select CLZ_TAB