patch-2.1.128 linux/drivers/char/saa5249.c

Next file: linux/drivers/char/tuner.c
Previous file: linux/drivers/char/pms.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.127/linux/drivers/char/saa5249.c linux/drivers/char/saa5249.c
@@ -666,6 +666,15 @@
 	return -EINVAL;
 }
 
+int init_saa_5249(struct video_init *v)
+{
+	printk(KERN_INFO "SAA5249 driver (" IF_NAME " interface) for VideoText version %d.%d\n",
+			VTX_VER_MAJ, VTX_VER_MIN);
+	i2c_register_driver(&i2c_driver_videotext);
+
+	return 0;
+}
+
 static struct video_device saa_template=
 {
 	IF_NAME,
@@ -684,15 +693,15 @@
 	0
 };
 
+#ifdef MODULE
+
 /*
  *	Routines for loadable modules
  */
 
 int init_module(void) 
 {
-	printk(KERN_INFO "SAA5249 driver (" IF_NAME " interface) for VideoText version %d.%d\n",
-			VTX_VER_MAJ, VTX_VER_MIN);
-	i2c_register_driver(&i2c_driver_videotext);
+	init_saa_5249(NULL);
 	return 0;
 }
 
@@ -701,3 +710,5 @@
 {
 	i2c_unregister_driver(&i2c_driver_videotext);
 }
+
+#endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov