Changeset 5570 for i2c/trunk/kernel/i2c.h

Timestamp:

12/15/08 13:45:58 (3 years ago)

Author:

khali

Message:

Drop Linux 2.4 binary incompatibility mode. It didn't make any sense
to start with. Dropping it will make the code more simple and the
differences to the mainline kernel smaller.

Files:

• i2c/trunk/kernel/i2c.h (modified) (2 diffs)

i2c/trunk/kernel/i2c.h

@@ -31 +31 @@
 #define I2C_DATE "SVN"
 #define I2C_VERSION "2.10.5-SVN"
-
-/* You can set this to 0 if you patch i2c into your kernel tree
-   and have no i2c module that have been compiled using a
-   Linux-2.4-compatible i2c.h header file left. 
-   As a result, you'll get a different code (can't really
-   say whether it's any better, but it's different). */
-#define I2C_LINUX_2_4_BINARY_COMPATIBILITY 1
 
 #include <linux/module.h>
@@ -239 +232 @@
 
                         /* data fields that are valid for all devices   */
-        struct semaphore bus;
-#if !I2C_LINUX_2_4_BINARY_COMPATIBILITY
-        struct semaphore list;  
-#endif
+        struct semaphore lock;  
         unsigned int flags;/* flags specifying div. data                */
 
         struct i2c_client *clients[I2C_CLIENT_MAX];
-#if I2C_LINUX_2_4_BINARY_COMPATIBILITY
-        int client_count; /* not used anywhere */
-#endif
+        int client_count; /* not used anywhere, kept for binary compat. */
 
         int timeout;