Changeset 3371

Timestamp:

09/13/99 21:19:16 (14 years ago)

Author:

frodo

Message:

Some minor patches to make in-kernel compilation for 2.0.x kernels

possible.

Most importantly, some compatibility declaration were moved out of
i2c.h (where they could interfere if you were not careful where you
included it) to the separate modules.

Location:

i2c/trunk/kernel

Files:

• i2c-algo-bit.c (modified) (1 diff)
• i2c-algo-pcf.c (modified) (1 diff)
• i2c-core.c (modified) (1 diff)
• i2c-dev.c (modified) (1 diff)
• i2c-elektor.c (modified) (1 diff)
• i2c-elv.c (modified) (1 diff)
• i2c-philips-par.c (modified) (1 diff)
• i2c-velleman.c (modified) (1 diff)
• i2c.h (modified) (1 diff)

i2c/trunk/kernel/i2c-algo-bit.c

@@ -42 +42 @@
 #else
 #  include <asm/segment.h>
+#endif
+
+/* 2.0.0 kernel compatibility */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+#define MODULE_AUTHOR(noone)
+#define MODULE_DESCRIPTION(none)
+#define MODULE_PARM(no,param)
+#define MODULE_PARM_DESC(no,description)
+#define EXPORT_SYMBOL(noexport)
+#define EXPORT_NO_SYMBOLS
 #endif
 

i2c/trunk/kernel/i2c-algo-pcf.c

@@ -45 +45 @@
 #include <linux/errno.h>
 #include <linux/sched.h>
+
+/* 2.0.0 kernel compatibility */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+#define MODULE_AUTHOR(noone)
+#define MODULE_DESCRIPTION(none)
+#define MODULE_PARM(no,param)
+#define MODULE_PARM_DESC(no,description)
+#define EXPORT_SYMBOL(noexport)
+#define EXPORT_NO_SYMBOLS
+#endif
+
 
 #include "i2c.h"

i2c/trunk/kernel/i2c-core.c

@@ -33 +33 @@
 
 /* ----- compatibility stuff ----------------------------------------------- */
+
+/* 2.0.0 kernel compatibility */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+#define MODULE_AUTHOR(noone)
+#define MODULE_DESCRIPTION(none)
+#define MODULE_PARM(no,param)
+#define MODULE_PARM_DESC(no,description)
+#define EXPORT_SYMBOL(noexport)
+#define EXPORT_NO_SYMBOLS
+#endif
 
 #include <linux/version.h>

i2c/trunk/kernel/i2c-dev.c

@@ -52 +52 @@
 #endif
 
+/* 2.0.0 kernel compatibility */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+#define MODULE_AUTHOR(noone)
+#define MODULE_DESCRIPTION(none)
+#define MODULE_PARM(no,param)
+#define MODULE_PARM_DESC(no,description)
+#define EXPORT_SYMBOL(noexport)
+#define EXPORT_NO_SYMBOLS
+#endif
 
 #include "i2c.h"

i2c/trunk/kernel/i2c-elektor.c

@@ -36 +36 @@
 #include <asm/irq.h>
 #include <asm/io.h>
+
+/* 2.0.0 kernel compatibility */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+#define MODULE_AUTHOR(noone)
+#define MODULE_DESCRIPTION(none)
+#define MODULE_PARM(no,param)
+#define MODULE_PARM_DESC(no,description)
+#define EXPORT_SYMBOL(noexport)
+#define EXPORT_NO_SYMBOLS
+#endif
 
 #include "i2c.h"

i2c/trunk/kernel/i2c-elv.c

@@ -33 +33 @@
 #else
 #define __init 
+#endif
+
+/* 2.0.0 kernel compatibility */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+#define MODULE_AUTHOR(noone)
+#define MODULE_DESCRIPTION(none)
+#define MODULE_PARM(no,param)
+#define MODULE_PARM_DESC(no,description)
+#define EXPORT_SYMBOL(noexport)
+#define EXPORT_NO_SYMBOLS
 #endif
 

i2c/trunk/kernel/i2c-philips-par.c

@@ -34 +34 @@
 #include <asm/io.h>
 #include <linux/stddef.h>
+
+/* 2.0.0 kernel compatibility */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+#define MODULE_AUTHOR(noone)
+#define MODULE_DESCRIPTION(none)
+#define MODULE_PARM(no,param)
+#define MODULE_PARM_DESC(no,description)
+#define EXPORT_SYMBOL(noexport)
+#define EXPORT_NO_SYMBOLS
+#endif
 
 #include "i2c.h"

i2c/trunk/kernel/i2c-velleman.c

@@ -32 +32 @@
 #include <asm/errno.h>     /* for 2.0 kernels to get ENODEV */
 #include <asm/io.h>
+
+/* 2.0.0 kernel compatibility */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
+#define MODULE_AUTHOR(noone)
+#define MODULE_DESCRIPTION(none)
+#define MODULE_PARM(no,param)
+#define MODULE_PARM_DESC(no,description)
+#define EXPORT_SYMBOL(noexport)
+#define EXPORT_NO_SYMBOLS
+#endif
 
 #include "i2c.h"

i2c/trunk/kernel/i2c.h

@@ -507 +507 @@
 #ifdef __KERNEL__
 
-#  if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
-/* Hack to make this thing compile under 2.0.xx kernels
- */
-
-#  ifdef MODULE
-#    define MODULE_AUTHOR(noone)
-#    define MODULE_DESCRIPTION(none)
-#    define MODULE_PARM(no,param)
-#    define MODULE_PARM_DESC(no,description)
-#    define EXPORT_SYMBOL(noexport)
-#    define EXPORT_NO_SYMBOLS
-#  endif
-
 #  ifndef NULL
 #    define NULL ( (void *) 0 )
 #  endif
-#endif
 
 #  ifndef ENODEV