From 778edf45e666a936581cc29ad71c7d1d0efc4d92 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 30 Jan 2015 09:57:23 +0000
Subject: [PATCH] staging: comedi: ni_labpc_cs: 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>
---
 drivers/staging/comedi/drivers/ni_labpc_cs.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index ece00109536c..746c4cd9978d 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -55,11 +55,7 @@ NI manuals:
 
 #include <linux/module.h>
 
-#include "../comedidev.h"
-
-#include <pcmcia/cistpl.h>
-#include <pcmcia/cisreg.h>
-#include <pcmcia/ds.h>
+#include "../comedi_pcmcia.h"
 
 #include "ni_labpc.h"
 
-- 
2.39.5