Merge fe72adeb2390f8943083b0a26ba9ac5b09a82f37 on remote branch

Change-Id: Id81fe1471e57369e8ebdc2bd5f1f71dce4b0b6a7
diff --git a/etc/init.qcom.usb.sh b/etc/init.qcom.usb.sh
index b8aa4cb..7a9e970 100644
--- a/etc/init.qcom.usb.sh
+++ b/etc/init.qcom.usb.sh
@@ -212,3 +212,14 @@
 if [ -d /config/usb_gadget/g1/functions/uvc.0 ]; then
 	setprop vendor.usb.uvc.function.init 1
 fi
+
+# enable ncm
+case "$target" in
+"neo" | "anorak")
+	if [ -d /config/usb_gadget/g1/functions/ncm.0 ]; then
+		cd /config/usb_gadget/g1/functions/ncm.0
+
+		echo WINNCM > os_desc/interface.ncm/compatible_id
+	fi
+    ;;
+esac