git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalke...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
usbvideo
/
Kconfig
diff --git
a/drivers/media/video/usbvideo/Kconfig
b/drivers/media/video/usbvideo/Kconfig
index
d6e1695
..
dfa7fc6
100644
(file)
--- a/
drivers/media/video/usbvideo/Kconfig
+++ b/
drivers/media/video/usbvideo/Kconfig
@@
-12,10
+12,13
@@
config USB_VICAM
module will be called vicam.
config USB_IBMCAM
module will be called vicam.
config USB_IBMCAM
- tristate "USB IBM (Xirlink) C-it Camera support"
+ tristate "USB IBM (Xirlink) C-it Camera support
(DEPRECATED)
"
depends on VIDEO_V4L1
select VIDEO_USBVIDEO
---help---
depends on VIDEO_V4L1
select VIDEO_USBVIDEO
---help---
+ This driver is DEPRECATED please use the gspca xirlink_cit module
+ instead.
+
Say Y here if you want to connect a IBM "C-It" camera, also known as
"Xirlink PC Camera" to your computer's USB port.
Say Y here if you want to connect a IBM "C-It" camera, also known as
"Xirlink PC Camera" to your computer's USB port.
@@
-27,10
+30,13
@@
config USB_IBMCAM
<file:Documentation/video4linux/ibmcam.txt> to learn more.
config USB_KONICAWC
<file:Documentation/video4linux/ibmcam.txt> to learn more.
config USB_KONICAWC
- tristate "USB Konica Webcam support"
+ tristate "USB Konica Webcam support
(DEPRECATED)
"
depends on VIDEO_V4L1
select VIDEO_USBVIDEO
---help---
depends on VIDEO_V4L1
select VIDEO_USBVIDEO
---help---
+ This driver is DEPRECATED (and known to crash) please use the
+ gspca konica module instead.
+
Say Y here if you want support for webcams based on a Konica
chipset. This is known to work with the Intel YC76 webcam.
Say Y here if you want support for webcams based on a Konica
chipset. This is known to work with the Intel YC76 webcam.