diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/ti-st/st_core.c (renamed from drivers/staging/ti-st/st_core.c) | 3 | ||||
| -rw-r--r-- | drivers/misc/ti-st/st_kim.c (renamed from drivers/staging/ti-st/st_kim.c) | 3 | ||||
| -rw-r--r-- | drivers/misc/ti-st/st_ll.c (renamed from drivers/staging/ti-st/st_ll.c) | 3 | ||||
| -rw-r--r-- | drivers/staging/ti-st/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/staging/ti-st/Makefile | 2 |
5 files changed, 6 insertions, 16 deletions
diff --git a/drivers/staging/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c index 5bef61e579c3..9bae0eb26b96 100644 --- a/drivers/staging/ti-st/st_core.c +++ b/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/drivers/staging/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c index 372a9960c304..6d23a7222627 100644 --- a/drivers/staging/ti-st/st_kim.c +++ b/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/drivers/staging/ti-st/st_ll.c b/drivers/misc/ti-st/st_ll.c index ed1e4bc180d3..2bda8dea15b0 100644 --- a/drivers/staging/ti-st/st_ll.c +++ b/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/drivers/staging/ti-st/Kconfig b/drivers/staging/ti-st/Kconfig index 858062dbed76..074b8e89e913 100644 --- a/drivers/staging/ti-st/Kconfig +++ b/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/drivers/staging/ti-st/Makefile b/drivers/staging/ti-st/Makefile index 0167d1d2c255..5f11b82c016c 100644 --- a/drivers/staging/ti-st/Makefile +++ b/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 |