compilation fixes

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index ef4bc793956ba8d751f3f3134316acdc65878076..fb79b8b536d73ee5f35ae0801fdce2effeb8a2f7 100644 (file)
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -1539,7 +1539,7 @@ void mite_cleanup(void);
 void init_drivers(void);
 
 
-void comedi_init(void)
+int comedi_init(void)
 {
        int i;
 
@@ -1566,6 +1566,8 @@ void comedi_init(void)
        comedi_rt_init();
 #endif
        init_drivers();
+
+       return 0;
 }
 
 void comedi_cleanup(void)
@@ -1599,9 +1601,7 @@ void comedi_cleanup(void)
 #ifdef MODULE
 int init_module(void)
 {
-       comedi_init();
-
-       return 0;
+       return comedi_init();
 }
 
 int cleanup_module(void)

diff --git a/comedi/drivers.c b/comedi/drivers.c
index dcfc58b987b2767228d97c3fb865899f627164d0..93ea63d847ab820410a35061181a3554b48e8e0f 100644 (file)
--- a/comedi/drivers.c
+++ b/comedi/drivers.c
@@ -123,7 +123,7 @@ attached:
        dev->attached=1;
        dev->driver=driv;
 
-       if(driver->module)
+       if(driv->module)
                __MOD_INC_USE_COUNT(driv->module);
 
        return 0;

diff --git a/comedi/kern_compat.h b/comedi/kern_compat.h
index 36482194c481c3f1ecc67975e8a4a65fc8f5f15c..716bb37471c94fc78b788ad96c89c546647eb2b4 100644 (file)
--- a/comedi/kern_compat.h
+++ b/comedi/kern_compat.h
@@ -211,18 +211,19 @@ typedef struct wait_queue *wait_queue_head_t;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)         /* ? */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
   #ifdef MODULE
-  /* don't ask.  It works. */
-  #define THIS_MODULE                  ((struct module *)&mod_use_count_)
+    /* don't ask.  It works. */
+    #define THIS_MODULE                        ((struct module *)&mod_use_count_)
   #else
-  #define THIS_MODULE  NULL
+    #define THIS_MODULE        NULL
   #endif
   #define __MOD_INC_USE_COUNT(x)       ((*(long *)(x))++, (*(long *)(x)) |= MOD_VISITED)
   #define __MOD_DEC_USE_COUNT(x)       ((*(long *)(x))--, (*(long *)(x)) |= MOD_VISITED)
 #else
   #ifdef MODULE
-  #define THIS_MODULE  &__this_module
+    #define THIS_MODULE        &__this_module
   #else
-  #define THIS_MODULE  NULL
+    #define THIS_MODULE        NULL
+  #endif
 #endif
 #endif
 

diff --git a/scripts/config.in b/scripts/config.in
index afd59d8d4f9692c8885eb4af3e2ac0df6d8f4106..11b511cbb18c720310996875209d606d72997680 100644 (file)
--- a/scripts/config.in
+++ b/scripts/config.in
@@ -1,5 +1,5 @@
 
-define_bool CONFIG_COMEDI=m
+define_bool CONFIG_COMEDI m
 
 source comedi/Config.in