Backport Frank's 2.6 changes to 2.4

diff --git a/include/linux/comedi_rt.h b/include/linux/comedi_rt.h
index 42140c5add3bbb58b3111ac392aaf932a27b6271..9609f8848ed3638e905f43435e32c07d0563c42d 100644 (file)
--- a/include/linux/comedi_rt.h
+++ b/include/linux/comedi_rt.h
@@ -55,7 +55,7 @@
 #define rt_printk printk
 #endif
 
-int comedi_request_irq(unsigned int irq,void (*handler)(int,void *,
+int comedi_request_irq(unsigned int irq,irqreturn_t (*handler)(int,void *,
        struct pt_regs *regs),unsigned long flags,const char *device,
        comedi_device *dev_id);
 void comedi_free_irq(unsigned int irq,comedi_device *dev_id);

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 8daf83c657aa785aa2bd49b988f19b3365f6a4f8..5f0359a37a17f159d28ee67d63eb14a2489cb85b 100644 (file)
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -25,7 +25,7 @@
 typedef void irqreturn_t;
 #define IRQ_NONE
 #define IRQ_HANDLED
-#define IRQ_RETVAL(x)
+#define IRQ_RETVAL(x) (void)(x)
 #endif
 
 #include_next <linux/interrupt.h>

diff --git a/include/linux/module.h b/include/linux/module.h
index 9dccf59ec84db2dd057262032f02d747211b47e3..e84413fe6dc25e0f144289f23d63cce5551146ff 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -7,21 +7,6 @@
 
 #include <linux/version.h>
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-static inline int try_module_get(struct module *module)
-{
-       if( module == NULL ) return 1;
-       __MOD_INC_USE_COUNT( module );
-       return 1;
-}
-static inline void module_put(struct module *module)
-{
-       if( module == NULL ) return;
-       __MOD_DEC_USE_COUNT( module )
-}
-#else
-#define MOD_IN_USE (0)
-#endif
 
 #if LINUX_VERSION_CODE < 0x020115
 #define MODULE_AUTHOR(a)
@@ -76,6 +61,22 @@ static inline void module_put(struct module *module)
 
 #include_next <linux/module.h>
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+static inline int try_module_get(struct module *module)
+{
+       if( module == NULL ) return 1;
+       __MOD_INC_USE_COUNT( module );
+       return 1;
+}
+static inline void module_put(struct module *module)
+{
+       if( module == NULL ) return;
+       __MOD_DEC_USE_COUNT( module );
+}
+#else
+#define MOD_IN_USE (0)
+#endif
+
 #endif /* _COMPAT_MODULE_H */