--- zzzz-none-000/linux-2.4.17/drivers/media/video/i2c-old.c	2001-09-30 19:26:06.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/media/video/i2c-old.c	2004-11-24 13:22:46.000000000 +0000
@@ -36,22 +36,20 @@
 static struct i2c_driver *drivers[I2C_DRIVER_MAX];
 static int bus_count = 0, driver_count = 0;
 
-#ifdef CONFIG_VIDEO_BUZ
 extern int saa7111_init(void);
 extern int saa7185_init(void);
-#endif
-#ifdef CONFIG_VIDEO_LML33
 extern int bt819_init(void);
 extern int bt856_init(void);
-#endif
 
 int i2c_init(void)
 {
 	printk(KERN_INFO "i2c: initialized%s\n",
 		scan ? " (i2c bus scan enabled)" : "");
 	/* anything to do here ? */
-#ifdef CONFIG_VIDEO_BUZ
+#if defined(CONFIG_VIDEO_BUZ) || defined(CONFIG_VIDEO_CYBERPRO)
 	saa7111_init();
+#endif
+#ifdef CONFIG_VIDEO_BUZ
 	saa7185_init();
 #endif
 #ifdef CONFIG_VIDEO_LML33