From 111fcf4981601c89561e225f2ac3bdc52c655aae Mon Sep 17 00:00:00 2001
From: Pavan Savoy <pavan_savoy@ti.com>
Date: Wed, 6 Oct 2010 12:18:14 -0400
Subject: [PATCH] --- yaml --- r: 220139 b: refs/heads/master c:
 a0cc2f3b51a8649da5262aba7501dc21738e1b8d h: refs/heads/master i:   220137:
 841bb14249b88f0ddb5bb0130e6439c03f3b5a44   220135:
 e7ff628033705c447031d7dfed95e28698d7f3d5 v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/{staging => misc}/ti-st/st_core.c |  3 ++-
 trunk/drivers/{staging => misc}/ti-st/st_kim.c  |  3 ++-
 trunk/drivers/{staging => misc}/ti-st/st_ll.c   |  3 ++-
 trunk/drivers/staging/ti-st/Kconfig             | 11 -----------
 trunk/drivers/staging/ti-st/Makefile            |  2 --
 6 files changed, 7 insertions(+), 17 deletions(-)
 rename trunk/drivers/{staging => misc}/ti-st/st_core.c (99%)
 rename trunk/drivers/{staging => misc}/ti-st/st_kim.c (99%)
 rename trunk/drivers/{staging => misc}/ti-st/st_ll.c (97%)

diff --git a/[refs] b/[refs]
index f28e97887c82..b2b01ed7859a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aecac19179180b7d6cda13f598e314c0870aee80
+refs/heads/master: a0cc2f3b51a8649da5262aba7501dc21738e1b8d
diff --git a/trunk/drivers/staging/ti-st/st_core.c b/trunk/drivers/misc/ti-st/st_core.c
similarity index 99%
rename from trunk/drivers/staging/ti-st/st_core.c
rename to trunk/drivers/misc/ti-st/st_core.c
index 5bef61e579c3..9bae0eb26b96 100644
--- a/trunk/drivers/staging/ti-st/st_core.c
+++ b/trunk/drivers/misc/ti-st/st_core.c
@@ -1,7 +1,8 @@
 /*
  *  Shared Transport Line discipline driver Core
  *	This hooks up ST KIM driver and ST LL driver
- *  Copyright (C) 2009 Texas Instruments
+ *  Copyright (C) 2009-2010 Texas Instruments
+ *  Author: Pavan Savoy <pavan_savoy@ti.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
diff --git a/trunk/drivers/staging/ti-st/st_kim.c b/trunk/drivers/misc/ti-st/st_kim.c
similarity index 99%
rename from trunk/drivers/staging/ti-st/st_kim.c
rename to trunk/drivers/misc/ti-st/st_kim.c
index 372a9960c304..6d23a7222627 100644
--- a/trunk/drivers/staging/ti-st/st_kim.c
+++ b/trunk/drivers/misc/ti-st/st_kim.c
@@ -2,7 +2,8 @@
  *  Shared Transport Line discipline driver Core
  *	Init Manager module responsible for GPIO control
  *	and firmware download
- *  Copyright (C) 2009 Texas Instruments
+ *  Copyright (C) 2009-2010 Texas Instruments
+ *  Author: Pavan Savoy <pavan_savoy@ti.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
diff --git a/trunk/drivers/staging/ti-st/st_ll.c b/trunk/drivers/misc/ti-st/st_ll.c
similarity index 97%
rename from trunk/drivers/staging/ti-st/st_ll.c
rename to trunk/drivers/misc/ti-st/st_ll.c
index ed1e4bc180d3..2bda8dea15b0 100644
--- a/trunk/drivers/staging/ti-st/st_ll.c
+++ b/trunk/drivers/misc/ti-st/st_ll.c
@@ -1,7 +1,8 @@
 /*
  *  Shared Transport driver
  *	HCI-LL module responsible for TI proprietary HCI_LL protocol
- *  Copyright (C) 2009 Texas Instruments
+ *  Copyright (C) 2009-2010 Texas Instruments
+ *  Author: Pavan Savoy <pavan_savoy@ti.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
diff --git a/trunk/drivers/staging/ti-st/Kconfig b/trunk/drivers/staging/ti-st/Kconfig
index 858062dbed76..074b8e89e913 100644
--- a/trunk/drivers/staging/ti-st/Kconfig
+++ b/trunk/drivers/staging/ti-st/Kconfig
@@ -3,17 +3,6 @@
 # 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.
-
 config ST_BT
 	tristate "BlueZ bluetooth driver for ST"
 	depends on BT && RFKILL
diff --git a/trunk/drivers/staging/ti-st/Makefile b/trunk/drivers/staging/ti-st/Makefile
index 0167d1d2c255..5f11b82c016c 100644
--- a/trunk/drivers/staging/ti-st/Makefile
+++ b/trunk/drivers/staging/ti-st/Makefile
@@ -2,6 +2,4 @@
 # 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
 obj-$(CONFIG_ST_BT) 		+= bt_drv.o