Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5

into kernel.bkbits.net:/home/davem/net-2.5

drivers/media/video/Kconfig

@@ -5,16 +5,6 @@
 menu "Video For Linux"
 	depends on VIDEO_DEV!=n
 
-config VIDEO_PROC_FS
-	bool "V4L information in proc filesystem"
-	depends on PROC_FS
-	help
-	  If you say Y here, you are able to access video device information
-	  in /proc/video.
-
-	  To use this option, you have to check, that the "/proc file system
-	  support" (CONFIG_PROC_FS) is enabled too.
-
 comment "Video Adapters"
 
 config VIDEO_BT848

drivers/usb/media/se401.c

@@ -130,6 +130,9 @@ static void rvfree(void *mem, unsigned long size)
  *
  ***************************************************************************/
 
+#warning please convert me from procfs to sysfs
+#undef CONFIG_VIDEO_PROC_FS
+
 #if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
 
 static struct proc_dir_entry *se401_proc_entry = NULL;

drivers/usb/media/stv680.c

@@ -519,6 +519,9 @@ static int stv_init (struct usb_stv *stv680)
  * /proc interface
  *******************************************************************/
 
+#warning please convert me from procfs to sysfs
+#undef CONFIG_VIDEO_PROC_FS
+
 #if defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS)
 
 static struct proc_dir_entry *stv680_proc_entry = NULL;

drivers/usb/media/usbvideo.c

@@ -37,6 +37,8 @@
 static int video_nr = -1;
 MODULE_PARM(video_nr, "i");
 
+#warning please convert me from procfs to sysfs
+#define USES_PROC_FS 0
 /*
  * Local prototypes.
  */