patch-2.3.99-pre9 linux/drivers/char/videodev.c

Next file: linux/drivers/ide/Config.in
Previous file: linux/drivers/char/tty_io.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre8/linux/drivers/char/videodev.c linux/drivers/char/videodev.c
@@ -41,7 +41,6 @@
 static struct video_device *video_device[VIDEO_NUM_DEVICES];
 
 #ifdef CONFIG_VIDEO_BT848
-extern int init_bttv_cards(struct video_init *);
 extern int i2c_tuner_init(struct video_init *);
 #endif
 #ifdef CONFIG_VIDEO_BWQCAM
@@ -59,9 +58,8 @@
 
 static struct video_init video_init_list[]={
 #ifdef CONFIG_VIDEO_BT848
-	{"i2c-tuner", i2c_tuner_init},
-	{"bttv", init_bttv_cards},
-#endif	
+        {"i2c-tuner", i2c_tuner_init},
+#endif 
 #ifdef CONFIG_VIDEO_BWQCAM
 	{"bw-qcam", init_bw_qcams},
 #endif	

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