aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
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/Kconfig11
-rw-r--r--drivers/staging/ti-st/Makefile2
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 @@
1/* 1/*
2 * Shared Transport Line discipline driver Core 2 * Shared Transport Line discipline driver Core
3 * This hooks up ST KIM driver and ST LL driver 3 * This hooks up ST KIM driver and ST LL driver
4 * Copyright (C) 2009 Texas Instruments 4 * Copyright (C) 2009-2010 Texas Instruments
5 * Author: Pavan Savoy <pavan_savoy@ti.com>
5 * 6 *
6 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as 8 * 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 @@
2 * Shared Transport Line discipline driver Core 2 * Shared Transport Line discipline driver Core
3 * Init Manager module responsible for GPIO control 3 * Init Manager module responsible for GPIO control
4 * and firmware download 4 * and firmware download
5 * Copyright (C) 2009 Texas Instruments 5 * Copyright (C) 2009-2010 Texas Instruments
6 * Author: Pavan Savoy <pavan_savoy@ti.com>
6 * 7 *
7 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as 9 * 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 @@
1/* 1/*
2 * Shared Transport driver 2 * Shared Transport driver
3 * HCI-LL module responsible for TI proprietary HCI_LL protocol 3 * HCI-LL module responsible for TI proprietary HCI_LL protocol
4 * Copyright (C) 2009 Texas Instruments 4 * Copyright (C) 2009-2010 Texas Instruments
5 * Author: Pavan Savoy <pavan_savoy@ti.com>
5 * 6 *
6 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as 8 * 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 @@
3# drivers (BT, FM and GPS) 3# drivers (BT, FM and GPS)
4# 4#
5menu "Texas Instruments shared transport line discipline" 5menu "Texas Instruments shared transport line discipline"
6config TI_ST
7 tristate "Shared transport core driver"
8 depends on RFKILL
9 select FW_LOADER
10 help
11 This enables the shared transport core driver for TI
12 BT / FM and GPS combo chips. This enables protocol drivers
13 to register themselves with core and send data, the responses
14 are returned to relevant protocol drivers based on their
15 packet types.
16
17config ST_BT 6config ST_BT
18 tristate "BlueZ bluetooth driver for ST" 7 tristate "BlueZ bluetooth driver for ST"
19 depends on BT && RFKILL 8 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 @@
2# Makefile for TI's shared transport line discipline 2# Makefile for TI's shared transport line discipline
3# and its protocol drivers (BT, FM, GPS) 3# and its protocol drivers (BT, FM, GPS)
4# 4#
5obj-$(CONFIG_TI_ST) += st_drv.o
6st_drv-objs := st_core.o st_kim.o st_ll.o
7obj-$(CONFIG_ST_BT) += bt_drv.o 5obj-$(CONFIG_ST_BT) += bt_drv.o