patch-2.3.34 linux/drivers/char/mem.c

• Lines: 32
• Date: Thu Dec 16 13:59:38 1999
• Orig file: v2.3.33/linux/drivers/char/mem.c
• Orig date: Tue Dec 7 09:32:43 1999

diff -u --recursive --new-file v2.3.33/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -15,7 +15,6 @@
 #include <linux/random.h>
 #include <linux/init.h>
 #include <linux/joystick.h>
-#include <linux/i2c.h>
 #include <linux/raw.h>
 #include <linux/capability.h>
 
@@ -23,6 +22,12 @@
 #include <asm/io.h>
 #include <asm/pgalloc.h>
 
+#ifdef CONFIG_VIDEO_BT848
+extern int i2c_init(void);
+#endif
+#ifdef CONFIG_I2C
+extern int i2c_init_all(void);
+#endif
 #ifdef CONFIG_SOUND
 void soundcore_init(void);
 #ifdef CONFIG_SOUND_OSS
@@ -664,6 +669,10 @@
 #ifdef CONFIG_FTAPE
 	ftape_init();
 #endif
+#ifdef CONFIG_I2C
+	i2c_init_all();
+#endif
+
 #ifdef CONFIG_VIDEO_BT848
 	i2c_init();
 #endif