From: Chase Southwood <chase.southwood@gmail.com>
To: gregkh@linuxfoundation.org
Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Chase Southwood <chase.southwood@gmail.com>
Subject: [PATCH v2 1/3] staging: comedi: addi_apci_1564: move addi_watchdog.h include to addi_apci_1564.c
Date: Wed, 2 Jul 2014 21:16:39 -0500 [thread overview]
Message-ID: <1404353799-28811-1-git-send-email-chase.southwood@gmail.com> (raw)
In-Reply-To: <1404353739-28607-1-git-send-email-chase.southwood@gmail.com>
Commit aed3f9d (staging: comedi: addi_apci_1564: absorb apci1564_reset()) moved
the only use of addi_watchdog.h from hwdrv_apci1564.c to addi_apci_1564.c, but
left the include statement itself in the former file. Move this include to the
file which actually uses it.
Signed-off-by: Chase Southwood <chase.southwood@gmail.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: H Hartley Sweeten <hsweeten@visionengravers.com>
---
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c | 2 --
drivers/staging/comedi/drivers/addi_apci_1564.c | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
index 4007fd2..7326f3a 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c
@@ -21,8 +21,6 @@
*
*/
-#include "../addi_watchdog.h"
-
#define APCI1564_ADDRESS_RANGE 128
/* Digital Input IRQ Function Selection */
diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index f71ee02..59786e7 100644
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -4,6 +4,7 @@
#include "../comedidev.h"
#include "comedi_fc.h"
#include "amcc_s5933.h"
+#include "addi_watchdog.h"
#include "addi-data/addi_common.h"
--
2.0.1
next prev parent reply other threads:[~2014-07-03 2:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-28 4:47 [PATCH 0/3] staging: comedi: addi_apci_1564: miscellaneous fixes and cleanups Chase Southwood
2014-06-28 4:48 ` [PATCH 1/3] staging: comedi: addi_apci_1564: move addi_watchdog.h include to addi_apci_1564.c Chase Southwood
2014-06-28 4:49 ` [PATCH 2/3] staging: comedi: addi_apci_1564: fix use of apci1564_reset() to disable DI interrupts Chase Southwood
2014-06-28 4:50 ` [PATCH 3/3] staging: comedi: addi_apci_1564: clean up apci1564_interrupt() Chase Southwood
2014-06-30 10:25 ` [PATCH 0/3] staging: comedi: addi_apci_1564: miscellaneous fixes and cleanups Ian Abbott
2014-07-02 2:06 ` Chase Southwood
2014-07-03 2:15 ` [PATCH v2 " Chase Southwood
2014-07-03 2:16 ` Chase Southwood [this message]
2014-07-03 2:17 ` [PATCH v2 2/3] staging: comedi: addi_apci_1564: fix use of apci1564_reset() to disable DI interrupts Chase Southwood
2014-07-03 2:17 ` [PATCH v2 3/3] staging: comedi: addi_apci_1564: clean up apci1564_interrupt() Chase Southwood
2014-07-03 9:39 ` [PATCH v2 0/3] staging: comedi: addi_apci_1564: miscellaneous fixes and cleanups Ian Abbott
2014-07-04 2:50 ` Chase Southwood
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=1404353799-28811-1-git-send-email-chase.southwood@gmail.com \
--to=chase.southwood@gmail.com \
--cc=abbotti@mev.co.uk \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=hsweeten@visionengravers.com \
--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;
as well as URLs for NNTP newsgroup(s).