From: Pavan Savoy <pavan_savoy@xxxxxx> modify the source files to include the new header ti_wilink_st.h, also modify the sources to include dependent headers so that inclusion of ti_wilink_st doesn't cause for compile errors/warnings. Signed-off-by: Pavan Savoy <pavan_savoy@xxxxxx> --- drivers/staging/ti-st/bt_drv.c | 2 +- drivers/staging/ti-st/st_core.c | 10 +--------- drivers/staging/ti-st/st_kim.c | 5 +++-- drivers/staging/ti-st/st_ll.c | 4 +++- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/staging/ti-st/bt_drv.c b/drivers/staging/ti-st/bt_drv.c index 61ae988..50da66d 100644 --- a/drivers/staging/ti-st/bt_drv.c +++ b/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 */ diff --git a/drivers/staging/ti-st/st_core.c b/drivers/staging/ti-st/st_core.c index fad97d7..03397be 100644 --- a/drivers/staging/ti-st/st_core.c +++ b/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 diff --git a/drivers/staging/ti-st/st_kim.c b/drivers/staging/ti-st/st_kim.c index be18c7a..09e2c97 100644 --- a/drivers/staging/ti-st/st_kim.c +++ b/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); diff --git a/drivers/staging/ti-st/st_ll.c b/drivers/staging/ti-st/st_ll.c index 7a1fb6d..d08b58e 100644 --- a/drivers/staging/ti-st/st_ll.c +++ b/drivers/staging/ti-st/st_ll.c @@ -19,7 +19,9 @@ */ #define pr_fmt(fmt) "(stll) :" fmt -#include "st_ll.h" +#include <linux/skbuff.h> +#include <linux/module.h> +#include "ti_wilink_st.h" /**********************************************************************/ /* internal functions */ -- 1.6.5 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
