patch-2.4.0-test3 linux/drivers/i2c/i2c-core.c

Next file: linux/drivers/i2o/i2o_block.c
Previous file: linux/drivers/char/zr36120.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/i2c/i2c-core.c linux/drivers/i2c/i2c-core.c
@@ -168,6 +168,7 @@
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,48))
 		proc_entry->proc_fops = &i2cproc_operations;
+		proc_entry->owner = THIS_MODULE;
 #else
 		proc_entry->ops = &i2cproc_inode_operations;
 #endif
@@ -1114,26 +1115,26 @@
 	extern int i2c_dev_init(void);
 #endif
 #ifdef CONFIG_I2C_ALGOBIT
-	extern int algo_bit_init(void);
+	extern int i2c_algo_bit_init(void);
 #endif
 #ifdef CONFIG_I2C_BITLP
-	extern int bitlp_init(void);
+	extern int i2c_bitlp_init(void);
 #endif
 #ifdef CONFIG_I2C_BITELV
-	extern int bitelv_init(void);
+	extern int i2c_bitelv_init(void);
 #endif
 #ifdef CONFIG_I2C_BITVELLE
-	extern int bitvelle_init(void);
+	extern int i2c_bitvelle_init(void);
 #endif
 #ifdef CONFIG_I2C_BITVIA
-	extern int bitvia_init(void);
+	extern int i2c_bitvia_init(void);
 #endif
 
 #ifdef CONFIG_I2C_ALGOPCF
-	extern int algo_pcf_init(void);	
+	extern int i2c_algo_pcf_init(void);	
 #endif
 #ifdef CONFIG_I2C_PCFISA
-	extern int pcfisa_init(void);
+	extern int i2c_pcfisa_init(void);
 #endif
 
 /* This is needed for automatic patch generation: sensors code starts here */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)