Merge remote-tracking branch 'torvalds/master' into perf/urgent

[linux-2.6-microblaze.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index a38cc61..ac3b306 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -701,3 +701,6 @@ config GENERIC_LIB_DEVMEM_IS_ALLOWED
 config PLDMFW
        bool
        default n
+
+config ASN1_ENCODER
+       tristate