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

staging: comedi: ni_daq_700: include new "comedi_pcmcia.h" header

Include the new "../comedi_pcmcia.h" header instead of
<pcmcia/cistpl.h>, <pcmcia/ds.h> and "../comedidev.h", which 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_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 5e472cb7fbd7..8f6396edd21c 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -51,10 +51,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 
-#include "../comedidev.h"
-
-#include <pcmcia/cistpl.h>
-#include <pcmcia/ds.h>
+#include "../comedi_pcmcia.h"
 
 /* daqcard700 registers */
 #define DIO_W		0x04	/* WO 8bit */