SOURCES: linux-2.4.32-i2c-2.10.0-drivers-i2c.diff - adjusted for 2...

[qboosh]

Author: qboosh                       Date: Wed Aug 16 11:31:35 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adjusted for 2.4.33

---- Files affected:
SOURCES:
   linux-2.4.32-i2c-2.10.0-drivers-i2c.diff (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.4.32-i2c-2.10.0-drivers-i2c.diff
diff -u SOURCES/linux-2.4.32-i2c-2.10.0-drivers-i2c.diff:1.1 SOURCES/linux-2.4.32-i2c-2.10.0-drivers-i2c.diff:1.2
--- SOURCES/linux-2.4.32-i2c-2.10.0-drivers-i2c.diff:1.1	Thu Apr  6 00:47:50 2006
+++ SOURCES/linux-2.4.32-i2c-2.10.0-drivers-i2c.diff	Wed Aug 16 13:31:29 2006
@@ -7438,8 +7438,8 @@
 -#endif
 +module_init(i2c_bitvelle_init);
 +module_exit(i2c_bitvelle_exit);
---- linux-old/include/linux/i2c.h	Sat Feb 18 17:38:46 2006
-+++ linux/include/linux/i2c.h	Sun Feb 19 08:27:28 2006
+--- linux-2.4.33/include/linux/i2c.h.orig	2006-08-11 06:18:20.000000000 +0200
++++ linux-2.4.33/include/linux/i2c.h	2006-08-16 13:21:39.845971000 +0200
 @@ -23,27 +23,27 @@
  /* With some changes from Kyösti Mälkki <kmalkki at cc.hut.fi> and
     Frodo Looijaard <frodol at dds.nl> */
@@ -7454,19 +7454,15 @@
  
 -#define I2C_DATE "20010830"
 -#define I2C_VERSION "2.6.1"
-+#define I2C_DATE "20060214"
-+#define I2C_VERSION "2.10.0"
- 
+-
 -#include <linux/i2c-id.h>	/* id values of adapters et. al. 	*/
 -#include <linux/types.h>
 -
 -
 -struct i2c_msg;
--
--
--#ifdef __KERNEL__
--
--/* --- Includes and compatibility declarations ------------------------ */
++#define I2C_DATE "20060214"
++#define I2C_VERSION "2.10.0"
+ 
 +/* 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. 
@@ -7474,6 +7470,10 @@
 +   say whether it's any better, but it's different). */
 +#define I2C_LINUX_2_4_BINARY_COMPATIBILITY 1
  
+-#ifdef __KERNEL__
+-
+-/* --- Includes and compatibility declarations ------------------------ */
+-
 +#include <linux/module.h>
 +#include <linux/types.h>
 +#include <linux/errno.h>
@@ -7669,7 +7669,7 @@
  
  
  /* ----- commands for the ioctl like i2c_command call:
-@@ -458,31 +486,14 @@
+@@ -458,9 +486,7 @@
  
  #define I2C_FUNCS	0x0705	/* Get the adapter functionality */
  #define I2C_RDWR	0x0707	/* Combined R/W transfer (one stop only)*/
@@ -7680,12 +7680,7 @@
  
  #define I2C_SMBUS	0x0720	/* SMBus-level access */
  
--/* ... algo-bit.c recognizes */
--#define I2C_UDELAY	0x0705	/* set delay in microsecs between each	*/
--				/* written byte (except address)	*/
--#define I2C_MDELAY	0x0706	/* millisec delay between written bytes */
--
- /* ----- I2C-DEV: char device interface stuff ------------------------- */
+@@ -468,16 +494,6 @@
  
  #define I2C_MAJOR	89		/* Device major number		*/
  
@@ -7702,7 +7697,7 @@
  /* These defines are used for probing i2c client addresses */
  /* Default fill of many variables */
  #define I2C_CLIENT_DEFAULTS {I2C_CLIENT_END, I2C_CLIENT_END, I2C_CLIENT_END, \
-@@ -544,5 +555,11 @@
+@@ -539,5 +555,11 @@
  #define i2c_is_isa_adapter(adapptr) \
          ((adapptr)->algo->id == I2C_ALGO_ISA)
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.4.32-i2c-2.10.0-drivers-i2c.diff?r1=1.1&r2=1.2&f=u