git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
Kconfig
diff --git
a/drivers/media/Kconfig
b/drivers/media/Kconfig
index
344d83a
..
87410db
100644
(file)
--- a/
drivers/media/Kconfig
+++ b/
drivers/media/Kconfig
@@
-25,7
+25,7
@@
config VIDEO_DEV
module will be called videodev.
config VIDEO_V4L1
module will be called videodev.
config VIDEO_V4L1
- bool
ean
"Enable Video For Linux API 1 (DEPRECATED)"
+ bool "Enable Video For Linux API 1 (DEPRECATED)"
depends on VIDEO_DEV
select VIDEO_V4L1_COMPAT
default y
depends on VIDEO_DEV
select VIDEO_V4L1_COMPAT
default y
@@
-36,7
+36,7
@@
config VIDEO_V4L1
If you are unsure as to whether this is required, answer Y.
config VIDEO_V4L1_COMPAT
If you are unsure as to whether this is required, answer Y.
config VIDEO_V4L1_COMPAT
- bool
ean
"Enable Video For Linux API 1 compatible Layer"
+ bool "Enable Video For Linux API 1 compatible Layer"
depends on VIDEO_DEV
default y
---help---
depends on VIDEO_DEV
default y
---help---
@@
-53,7
+53,8
@@
config VIDEO_V4L1_COMPAT
If you are unsure as to whether this is required, answer Y.
config VIDEO_V4L2
If you are unsure as to whether this is required, answer Y.
config VIDEO_V4L2
- tristate
+ bool
+ depends on VIDEO_DEV
default y
source "drivers/media/video/Kconfig"
default y
source "drivers/media/video/Kconfig"
@@
-66,6
+67,7
@@
source "drivers/media/common/Kconfig"
config VIDEO_TUNER
tristate
config VIDEO_TUNER
tristate
+ depends on I2C
config VIDEO_BUF
tristate
config VIDEO_BUF
tristate
@@
-81,6
+83,7
@@
config VIDEO_IR
config VIDEO_TVEEPROM
tristate
config VIDEO_TVEEPROM
tristate
+ depends on I2C
config USB_DABUSB
tristate "DABUSB driver"
config USB_DABUSB
tristate "DABUSB driver"