From: pavan_savoy@ti.com
To: gregkh@suse.de, alan@lxorguk.ukuu.org.uk
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Pavan Savoy <pavan_savoy@ti.com>
Subject: [PATCH 3/3] drivers:staging:ti-st: use new ti_wilink_st header
Date: Thu, 16 Sep 2010 20:49:32 -0400 [thread overview]
Message-ID: <1284684572-12508-4-git-send-email-pavan_savoy@ti.com> (raw)
In-Reply-To: <1284684572-12508-3-git-send-email-pavan_savoy@ti.com>
From: Pavan Savoy <pavan_savoy@ti.com>
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@ti.com>
---
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
prev parent reply other threads:[~2010-09-16 23:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-17 0:49 [PATCH 0/3] prepare ti-st to mv out of staging pavan_savoy
2010-09-16 23:58 ` Greg KH
2010-09-17 1:16 ` Savoy, Pavan
2010-09-20 16:16 ` Savoy, Pavan
2010-09-20 17:30 ` Greg KH
2010-09-20 19:19 ` Savoy, Pavan
2010-09-17 0:49 ` [PATCH 1/3] drivers:staging:ti-st: set right the data types pavan_savoy
2010-09-17 0:49 ` [PATCH 2/3] drivers:staging:ti-st: mv headers to ti_wilink_st pavan_savoy
2010-09-17 0:49 ` pavan_savoy [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1284684572-12508-4-git-send-email-pavan_savoy@ti.com \
--to=pavan_savoy@ti.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®