patch from Tomasz

diff --git a/Rules.make b/Rules.make
index f55ea43dc29098e4af0073a63725e5fb03c5a44e..84cdae59a13f88836b3a3632b9d0214bfaeee945 100644 (file)
--- 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 7c07077e18ed4867c83f27302f8258d57cdb5234..f7528cd0f533bd244b9d731c72a5466fa3519fdb 100644 (file)
--- 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 9fd2e3d8a72ef3ee18ca54a5059345b51c2c3739..0727102b553e6a83935a2c771a8195caeec1444a 100644 (file)
--- 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