summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2015-01-30 09:57:22 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-02-07 17:05:50 +0800
commit51d5483f7b7b753dfada03408c3aaf6610b46137 (patch)
tree1ab74869ba722e356ee9ec1f1a0f54ddfb9c282d
parenta411febedebeeb61f264daa9d62b456ad1a7a072 (diff)
downloadtalos-op-linux-51d5483f7b7b753dfada03408c3aaf6610b46137.tar.gz
talos-op-linux-51d5483f7b7b753dfada03408c3aaf6610b46137.zip
staging: comedi: ni_daq_dio24: include new "comedi_pcmcia.h" header
Include the new "../comedi_pcmcia.h" header instead of <pcmcia/cistpl.h>, <pcmcia/cisreg.h>, <pcmcia/ds.h> and "../comedidev.h". <pcmcia/cisreg.h> isn't needed and the others will now get included indirectly. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_dio24.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index 8cfabdbaa30c..a208cb348437 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -32,11 +32,7 @@ the PCMCIA interface.
*/
#include <linux/module.h>
-#include "../comedidev.h"
-
-#include <pcmcia/cistpl.h>
-#include <pcmcia/cisreg.h>
-#include <pcmcia/ds.h>
+#include "../comedi_pcmcia.h"
#include "8255.h"
OpenPOWER on IntegriCloud