diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2003-08-20 20:55:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2003-08-20 20:55:43 -0700 |
| commit | 3c559f1fe67f4538ba8983833fab2d2e23f5dc11 (patch) | |
| tree | cff28746c1ec7b99f715a8e87dc67b6296e7cc91 | |
| parent | 093a6aa4c580d3d02504f95089fb8eb746409a3d (diff) | |
| parent | a527cfc1b9351c390a213428345c8afb2857e1c6 (diff) | |
Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
into kernel.bkbits.net:/home/davem/net-2.5
| -rw-r--r-- | drivers/media/video/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/usb/media/se401.c | 3 | ||||
| -rw-r--r-- | drivers/usb/media/stv680.c | 3 | ||||
| -rw-r--r-- | drivers/usb/media/usbvideo.c | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 50e706e6a0e8..f8ec5b51bcfb 100644 --- a/drivers/media/video/Kconfig +++ b/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 diff --git a/drivers/usb/media/se401.c b/drivers/usb/media/se401.c index 8e9928c78e42..9be1d6e76a75 100644 --- a/drivers/usb/media/se401.c +++ b/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; diff --git a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c index 563bbcfd27bb..b1d44efb72bb 100644 --- a/drivers/usb/media/stv680.c +++ b/drivers/usb/media/stv680.c @@ -519,6 +519,9 @@ exit: * /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; diff --git a/drivers/usb/media/usbvideo.c b/drivers/usb/media/usbvideo.c index 9f85a9a8cdc0..a0745a30e499 100644 --- a/drivers/usb/media/usbvideo.c +++ b/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. */ |