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 /drivers/media/video/Kconfig | |
| 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 'drivers/media/video/Kconfig')
| -rw-r--r-- | drivers/media/video/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 639e8b6c35b..bc773781993 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
| @@ -577,14 +577,14 @@ config VIDEO_ZORAN_AVS6EYES | |||
| 577 | 577 | ||
| 578 | config VIDEO_MEYE | 578 | config VIDEO_MEYE |
| 579 | tristate "Sony Vaio Picturebook Motion Eye Video For Linux" | 579 | tristate "Sony Vaio Picturebook Motion Eye Video For Linux" |
| 580 | depends on PCI && SONYPI && VIDEO_V4L1 | 580 | depends on PCI && SONY_LAPTOP && VIDEO_V4L1 |
| 581 | ---help--- | 581 | ---help--- |
| 582 | This is the video4linux driver for the Motion Eye camera found | 582 | This is the video4linux driver for the Motion Eye camera found |
| 583 | in the Vaio Picturebook laptops. Please read the material in | 583 | in the Vaio Picturebook laptops. Please read the material in |
| 584 | <file:Documentation/video4linux/meye.txt> for more information. | 584 | <file:Documentation/video4linux/meye.txt> for more information. |
| 585 | 585 | ||
| 586 | If you say Y or M here, you need to say Y or M to "Sony Programmable | 586 | If you say Y or M here, you need to say Y or M to "Sony Laptop |
| 587 | I/O Control Device" in the character device section. | 587 | Extras" in the misc device section. |
| 588 | 588 | ||
| 589 | To compile this driver as a module, choose M here: the | 589 | To compile this driver as a module, choose M here: the |
| 590 | module will be called meye. | 590 | module will be called meye. |