---

yaml
---
r: 219911
b: refs/heads/master
c: 83ef41f
h: refs/heads/master
i:
  219909: b8e8645
  219907: 5965564
  219903: 6154a6d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d702ea3191ea8ab3efd3f203e88dba1d8016eba
+refs/heads/master: 83ef41f0858b48cce4f8ca23f674ec55d50bf47d

trunk/drivers/staging/ti-st/bt_drv.c

@@ -24,7 +24,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
-#include "st.h"
+#include "ti_wilink_st.h"
 #include "bt_drv.h"
 
 /* Define this macro to get debug msg */

trunk/drivers/staging/ti-st/st_core.c

@@ -28,15 +28,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/hci.h>
-#include "fm.h"
-/*
- * packet formats for fm and gps
- * #include "gps.h"
- */
-#include "st_core.h"
-#include "st_kim.h"
-#include "st_ll.h"
-#include "st.h"
+#include "ti_wilink_st.h"
 
 /* strings to be used for rfkill entries and by
  * ST Core to be used for sysfs debug entry

trunk/drivers/staging/ti-st/st_kim.c

@@ -28,15 +28,16 @@
 #include <linux/gpio.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
-
 #include <linux/sched.h>
+#include <linux/rfkill.h>
 
-#include "st_kim.h"
 /* understand BT events for fw response */
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/hci.h>
 
+#include "ti_wilink_st.h"
+
 
 static int kim_probe(struct platform_device *pdev);
 static int kim_remove(struct platform_device *pdev);