diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-29 13:47:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-29 13:47:25 -0400 |
| commit | 6b06d2cc6d52830e3e0c001006b26255f47184dd (patch) | |
| tree | 2df1fbc87b1d83b97b230c207dbe795e2c5c6423 /Documentation/video4linux | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
| parent | aac60c11132d7ab0776cf036ac9fd6113a210859 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (105 commits)
sonypi: use mutex instead of semaphore
sony-laptop: remove user visible camera controls as platform attributes
meye: make meye use sony-laptop instead of sonypi
sony-laptop: add a meye-usable include file for camera ops
sony-laptop: complete the motion eye camera support in sony-laptop
sonypi: try to detect if sony-laptop has already taken one of the known ioports
sonypi: suggest sonypi users to try sony-laptop instead
sony-laptop: add edge modem support (also called WWAN)
sony-laptop: add locking on accesses to the ioport and global vars
sony-laptop: add camera enable/disable parameter, better handle possible infinite loop
thinkpad-acpi: make drivers/misc/thinkpad_acpi:fan_mutex static
ACPI: thinkpad-acpi: add sysfs support to wan and bluetooth subdrivers
ACPI: thinkpad-acpi: add sysfs support to hotkey subdriver
ACPI: thinkpad-acpi: improve dock subdriver initialization
ACPI: thinkpad-acpi: improve debugging for acpi helpers
ACPI: thinkpad-acpi: improve fan control documentation
ACPI: thinkpad-acpi: map ENXIO to EINVAL for fan sysfs
ACPI: thinkpad-acpi: fix a fan watchdog invocation
ACPI: thinkpad-acpi: do not arm fan watchdog if it would not work
ACPI: thinkpad-acpi: add a fan-control feature master toggle
...
Diffstat (limited to 'Documentation/video4linux')
| -rw-r--r-- | Documentation/video4linux/meye.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/video4linux/meye.txt b/Documentation/video4linux/meye.txt index ecb34160e61d..5e51c59bf2b0 100644 --- a/Documentation/video4linux/meye.txt +++ b/Documentation/video4linux/meye.txt | |||
| @@ -5,10 +5,9 @@ Vaio Picturebook Motion Eye Camera Driver Readme | |||
| 5 | Copyright (C) 2000 Andrew Tridgell <tridge@samba.org> | 5 | Copyright (C) 2000 Andrew Tridgell <tridge@samba.org> |
| 6 | 6 | ||
| 7 | This driver enable the use of video4linux compatible applications with the | 7 | This driver enable the use of video4linux compatible applications with the |
| 8 | Motion Eye camera. This driver requires the "Sony Vaio Programmable I/O | 8 | Motion Eye camera. This driver requires the "Sony Laptop Extras" driver (which |
| 9 | Control Device" driver (which can be found in the "Character drivers" | 9 | can be found in the "Misc devices" section of the kernel configuration utility) |
| 10 | section of the kernel configuration utility) to be compiled and installed | 10 | to be compiled and installed (using its "camera=1" parameter). |
| 11 | (using its "camera=1" parameter). | ||
| 12 | 11 | ||
| 13 | It can do at maximum 30 fps @ 320x240 or 15 fps @ 640x480. | 12 | It can do at maximum 30 fps @ 320x240 or 15 fps @ 640x480. |
| 14 | 13 | ||