diff --git a/[refs] b/[refs] index a71a4a371e8c..328c47cca2a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c7afa08d80dbcfdbd7fd04388f7bc475ec8acf69 +refs/heads/master: e5558679bbb80788dc8c4c30484ac0a68e971ca5 diff --git a/trunk/drivers/staging/ti-st/bt_drv.c b/trunk/drivers/staging/ti-st/bt_drv.c index 50da66db72c2..75065bf39e5c 100644 --- a/trunk/drivers/staging/ti-st/bt_drv.c +++ b/trunk/drivers/staging/ti-st/bt_drv.c @@ -24,7 +24,7 @@ #include #include -#include "ti_wilink_st.h" +#include #include "bt_drv.h" /* Define this macro to get debug msg */ diff --git a/trunk/drivers/staging/ti-st/st_core.c b/trunk/drivers/staging/ti-st/st_core.c index 03397bee37db..5bef61e579c3 100644 --- a/trunk/drivers/staging/ti-st/st_core.c +++ b/trunk/drivers/staging/ti-st/st_core.c @@ -28,7 +28,7 @@ #include #include #include -#include "ti_wilink_st.h" +#include /* strings to be used for rfkill entries and by * ST Core to be used for sysfs debug entry diff --git a/trunk/drivers/staging/ti-st/st_kim.c b/trunk/drivers/staging/ti-st/st_kim.c index 09e2c97562be..372a9960c304 100644 --- a/trunk/drivers/staging/ti-st/st_kim.c +++ b/trunk/drivers/staging/ti-st/st_kim.c @@ -36,7 +36,7 @@ #include #include -#include "ti_wilink_st.h" +#include static int kim_probe(struct platform_device *pdev); diff --git a/trunk/drivers/staging/ti-st/st_ll.c b/trunk/drivers/staging/ti-st/st_ll.c index d08b58e78083..ed1e4bc180d3 100644 --- a/trunk/drivers/staging/ti-st/st_ll.c +++ b/trunk/drivers/staging/ti-st/st_ll.c @@ -21,7 +21,7 @@ #define pr_fmt(fmt) "(stll) :" fmt #include #include -#include "ti_wilink_st.h" +#include /**********************************************************************/ /* internal functions */ diff --git a/trunk/drivers/staging/ti-st/ti_wilink_st.h b/trunk/include/linux/ti_wilink_st.h similarity index 100% rename from trunk/drivers/staging/ti-st/ti_wilink_st.h rename to trunk/include/linux/ti_wilink_st.h