Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[pandora-kernel.git] / Documentation / video4linux / meye.txt

diff --git a/Documentation/video4linux/meye.txt b/Documentation/video4linux/meye.txt
index ecb3416..34e2842 100644 (file)
--- a/Documentation/video4linux/meye.txt
+++ b/Documentation/video4linux/meye.txt
@@ -1,14 +1,13 @@
 Vaio Picturebook Motion Eye Camera Driver Readme
 ------------------------------------------------
        Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net>
-       Copyright (C) 2001-2002 Alcôve <www.alcove.com>
+       Copyright (C) 2001-2002 Alcôve <www.alcove.com>
        Copyright (C) 2000 Andrew Tridgell <tridge@samba.org>
 
 This driver enable the use of video4linux compatible applications with the
-Motion Eye camera. This driver requires the "Sony Vaio Programmable I/O
-Control Device" driver (which can be found in the "Character drivers"
-section of the kernel configuration utility) to be compiled and installed
-(using its "camera=1" parameter).
+Motion Eye camera. This driver requires the "Sony Laptop Extras" driver (which
+can be found in the "Misc devices" section of the kernel configuration utility)
+to be compiled and installed (using its "camera=1" parameter).
 
 It can do at maximum 30 fps @ 320x240 or 15 fps @ 640x480.
 
@@ -46,8 +45,6 @@ module argument syntax (<param>=<value> when passing the option to the
 module or meye.<param>=<value> on the kernel boot line when meye is
 statically linked into the kernel). Those options are:
 
-       forcev4l1:      force use of V4L1 API instead of V4L2
-
        gbuffers:       number of capture buffers, default is 2 (32 max)
 
        gbufsize:       size of each capture buffer, default is 614400
@@ -80,9 +77,8 @@ Usage:
 Private API:
 ------------
 
-       The driver supports frame grabbing with the video4linux API
-       (either v4l1 or v4l2), so all video4linux tools (like xawtv)
-       should work with this driver.
+       The driver supports frame grabbing with the video4linux API,
+       so all video4linux tools (like xawtv) should work with this driver.
 
        Besides the video4linux interface, the driver has a private interface
        for accessing the Motion Eye extended parameters (camera sharpness,
@@ -124,7 +120,4 @@ Private API:
 Bugs / Todo:
 ------------
 
-       - the driver could be much cleaned up by removing the v4l1 support.
-         However, this means all v4l1-only applications will stop working.
-
        - 'motioneye' still uses the meye private v4l1 API extensions.