Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 17 insertions, 0 deletions

diff --git a/drivers/misc/ti-st/Kconfig b/drivers/misc/ti-st/Kconfig
new file mode 100644
index 000000000000..abb5de1afce3
--- /dev/null
+++ b/drivers/misc/ti-st/Kconfig
@@ -0,0 +1,17 @@
+#
+# TI's shared transport line discipline and the protocol
+# drivers (BT, FM and GPS)
+#
+menu "Texas Instruments shared transport line discipline"
+config TI_ST
+        tristate "Shared transport core driver"
+        depends on NET && GPIOLIB
+        select FW_LOADER
+        help
+          This enables the shared transport core driver for TI
+          BT / FM and GPS combo chips. This enables protocol drivers
+          to register themselves with core and send data, the responses
+          are returned to relevant protocol drivers based on their
+          packet types.
+
+endmenu