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

• Lines: 40
• Date: Wed Dec 29 17:13:02 1999
• Orig file: v2.3.35/linux/drivers/char/mem.c
• Orig date: Mon Dec 20 18:48:21 1999

diff -u --recursive --new-file v2.3.35/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -61,6 +61,9 @@
 #ifdef CONFIG_USB
 extern void usb_init(void);
 #endif
+#ifdef CONFIG_PHONE
+extern void telephony_init(void);
+#endif
      
 static ssize_t do_write_mem(struct file * file, void *p, unsigned long realp,
 			    const char * buf, size_t count, loff_t *ppos)
@@ -624,6 +627,9 @@
 #ifdef CONFIG_USB
 	usb_init();
 #endif
+#ifdef CONFIG_I2C
+        i2c_init_all();
+#endif
 #if defined (CONFIG_FB)
 	fbmem_init();
 #endif
@@ -669,10 +675,6 @@
 #ifdef CONFIG_FTAPE
 	ftape_init();
 #endif
-#ifdef CONFIG_I2C
-	i2c_init_all();
-#endif
-
 #ifdef CONFIG_VIDEO_BT848
 	i2c_init();
 #endif
@@ -682,5 +684,8 @@
 #ifdef CONFIG_VIDEO_DEV
 	videodev_init();
 #endif
+#ifdef CONFIG_PHONE
+	telephony_init();
+#endif	
 	return 0;
 }