From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 27 Mar 2010 19:23:59 +0000 (+0000)
Subject: luci-0.9: merge r5956
X-Git-Tag: 0.9.0~23
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=291206c9fa8051bd3de7b92e105433d3502b4fb6

luci-0.9: merge r5956
---

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index b22b7d073..d803b9635 100644
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -240,7 +240,7 @@ endef
 
 
 
-NIXIO_TLS:=cyassl
+NIXIO_TLS:=
 
 define Package/luci-nixio
   $(call Package/luci/libtemplate)
@@ -255,7 +255,10 @@ endef
 define Package/luci-nixio/config
 	choice
 		prompt "TLS Provider"
-		default PACKAGE_luci-nixio_cyassl
+		default PACKAGE_luci-nixio_notls
+
+		config PACKAGE_luci-nixio_notls
+			bool "Disabled"
 
 		config PACKAGE_luci-nixio_axtls
 			bool "Builtin (axTLS)"