From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 30 Jan 2015 09:57:22 +0000 (+0000)
Subject: staging: comedi: ni_daq_dio24: include new "comedi_pcmcia.h" header
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=51d5483f7b7b753dfada03408c3aaf6610b46137;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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>
---

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"