From 639c9fb37224002886abf0d43ed0fe8230b288c4 Mon Sep 17 00:00:00 2001
From: Pavan Savoy <pavan_savoy@ti.com>
Date: Wed, 6 Oct 2010 12:18:15 -0400
Subject: [PATCH] --- yaml --- r: 220140 b: refs/heads/master c:
 2bb32e84a17fab547c7a746c7888e846c9cd88cc h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/misc/Kconfig        |  1 +
 trunk/drivers/misc/Makefile       |  1 +
 trunk/drivers/misc/ti-st/Kconfig  | 17 +++++++++++++++++
 trunk/drivers/misc/ti-st/Makefile |  6 ++++++
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 trunk/drivers/misc/ti-st/Kconfig
 create mode 100644 trunk/drivers/misc/ti-st/Makefile

diff --git a/[refs] b/[refs]
index b2b01ed7859a..b33dcf4773f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0cc2f3b51a8649da5262aba7501dc21738e1b8d
+refs/heads/master: 2bb32e84a17fab547c7a746c7888e846c9cd88cc
diff --git a/trunk/drivers/misc/Kconfig b/trunk/drivers/misc/Kconfig
index 0b591b658243..c36ee95d3e5b 100644
--- a/trunk/drivers/misc/Kconfig
+++ b/trunk/drivers/misc/Kconfig
@@ -394,5 +394,6 @@ source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"
 source "drivers/misc/iwmc3200top/Kconfig"
+source "drivers/misc/ti-st/Kconfig"
 
 endif # MISC_DEVICES
diff --git a/trunk/drivers/misc/Makefile b/trunk/drivers/misc/Makefile
index 255a80dc9d73..ab3353a597d8 100644
--- a/trunk/drivers/misc/Makefile
+++ b/trunk/drivers/misc/Makefile
@@ -35,3 +35,4 @@ obj-y				+= eeprom/
 obj-y				+= cb710/
 obj-$(CONFIG_VMWARE_BALLOON)	+= vmware_balloon.o
 obj-$(CONFIG_ARM_CHARLCD)	+= arm-charlcd.o
+obj-y				+= ti-st/
diff --git a/trunk/drivers/misc/ti-st/Kconfig b/trunk/drivers/misc/ti-st/Kconfig
new file mode 100644
index 000000000000..2c8c3f39710d
--- /dev/null
+++ b/trunk/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 RFKILL
+	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
diff --git a/trunk/drivers/misc/ti-st/Makefile b/trunk/drivers/misc/ti-st/Makefile
new file mode 100644
index 000000000000..78d7ebb14749
--- /dev/null
+++ b/trunk/drivers/misc/ti-st/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for TI's shared transport line discipline
+# and its protocol drivers (BT, FM, GPS)
+#
+obj-$(CONFIG_TI_ST) 		+= st_drv.o
+st_drv-objs			:= st_core.o st_kim.o st_ll.o