From: David Schleef <ds@schleef.org>
Date: Sat, 27 May 2000 00:53:18 +0000 (+0000)
Subject: patch from Tomasz
X-Git-Tag: r0_7_45~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=458019b1a5940f4f37a49feaba58d46a7ec7b470;p=comedi.git

patch from Tomasz
---

diff --git a/Rules.make b/Rules.make
index f55ea43d..84cdae59 100644
--- a/Rules.make
+++ b/Rules.make
@@ -215,17 +215,17 @@ $(MODINCL)/%.ver: %.c
 	
 $(addprefix $(MODINCL)/,$(SYMTAB_OBJS:.o=.ver)): $(LINUXDIR)/include/linux/autoconf.h
 
-$(LINUXDIR)/include/linux/modversions.h: $(addprefix $(MODINCL)/,$(SYMTAB_OBJS:.o=.ver))
-	@echo updating $(LINUXDIR)/include/linux/modversions.h
-	@(echo "#ifndef _LINUX_MODVERSIONS_H";\
-	  echo "#define _LINUX_MODVERSIONS_H"; \
-	  echo "#include <linux/modsetver.h>"; \
-	  cd $(LINUXDIR)/include/linux/modules; \
-	  for f in *.ver; do \
-	    if [ -f $$f ]; then echo "#include <linux/modules/$${f}>"; fi; \
-	  done; \
-	  echo "#endif"; \
-	) > $@
+#$(LINUXDIR)/include/linux/modversions.h: $(addprefix $(MODINCL)/,$(SYMTAB_OBJS:.o=.ver))
+#	@echo updating $(LINUXDIR)/include/linux/modversions.h
+#	@(echo "#ifndef _LINUX_MODVERSIONS_H";\
+#	  echo "#define _LINUX_MODVERSIONS_H"; \
+#	  echo "#include <linux/modsetver.h>"; \
+#	  cd $(LINUXDIR)/include/linux/modules; \
+#	  for f in *.ver; do \
+#	    if [ -f $$f ]; then echo "#include <linux/modules/$${f}>"; fi; \
+#	  done; \
+#	  echo "#endif"; \
+#	) > $@
 
 dep fastdep: $(LINUXDIR)/include/linux/modversions.h
 
diff --git a/comedi/Config.in b/comedi/Config.in
index 7c07077e..f7528cd0 100644
--- a/comedi/Config.in
+++ b/comedi/Config.in
@@ -46,7 +46,7 @@ fi
 bool 'National Instruments boards' CONFIG_COMEDI_NI
 if [ "$CONFIG_COMEDI_NI" = "y" ];then
 	tristate '  AT-MIO E series' CONFIG_COMEDI_NI_ATMIO
-	if [ "$CONFIG_PCMCIA" == "y" -o "$CONFIG_PCMCIA" == "m" ];then
+	if [ "$CONFIG_PCMCIA" = "y" -o "$CONFIG_PCMCIA" = "m" ];then
 		tristate '  PCMCIA MIO E series' CONFIG_COMEDI_NI_MIO_CS
 	fi
 	if [ "$CONFIG_PCI" = "y" ];then
@@ -54,6 +54,10 @@ if [ "$CONFIG_COMEDI_NI" = "y" ];then
 		tristate '  NI PCI-DIO series' CONFIG_COMEDI_NI_PCIDIO
 		if [ "$CONFIG_COMEDI_NI_PCIMIO" = "y" -o "$CONFIG_COMEDI_NI_PCIDIO" = "y" ];then
 			define_bool CONFIG_COMEDI_MITE y
+		else
+			if [ "$CONFIG_COMEDI_NI_PCIMIO" = "m" -o "$CONFIG_COMEDI_NI_PCIDIO" = "m" ];then
+				define_bool CONFIG_COMEDI_MITE y
+			fi
 		fi
 	fi
 	tristate '  AT-MIO-16D' CONFIG_COMEDI_NI_ATMIO16D
diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index 9fd2e3d8..0727102b 100644
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -35,9 +35,9 @@
 #include <linux/ioport.h>
 #include <linux/mm.h>
 #include <linux/malloc.h>
-#include <linux/kmod.h>
 #include <asm/io.h>
 #ifdef LINUX_V22
+#include <linux/kmod.h>
 #include <asm/uaccess.h>
 #endif