Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / comedi / drivers / ni_daq_dio24.c

diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index 8cfabdbaa30ceba19933315d54de958315eec13a..a208cb3484375d8868d6ab4f3701876cb5b5a566 100644 (file)
--- 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"