summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-05-29 12:51:33 -0400
committerMichael Krufky <mkrufky@linuxtv.org>2006-05-29 12:51:33 -0400
commit64860b88ea284a524f48e7d65400bf47f0d47547 (patch)
tree6a24084edb97071a716e553d186e6f9884c9ef62 /linux
parent3ed3172e98e1adcfc81460d3bb64d1653a5adb6a (diff)
parent65a6e64bf6742f52a280ba578eaf997549fa0ad7 (diff)
downloadmediapointer-dvb-s2-64860b88ea284a524f48e7d65400bf47f0d47547.tar.gz
mediapointer-dvb-s2-64860b88ea284a524f48e7d65400bf47f0d47547.tar.bz2
merge: from ~mkrufky/fixes
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig
index 344d83aae..ef52e6da0 100644
--- a/linux/drivers/media/Kconfig
+++ b/linux/drivers/media/Kconfig
@@ -25,7 +25,7 @@ config VIDEO_DEV
module will be called videodev.
config VIDEO_V4L1
- boolean "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
@@ -36,7 +36,7 @@ config VIDEO_V4L1
If you are unsure as to whether this is required, answer Y.
config VIDEO_V4L1_COMPAT
- boolean "Enable Video For Linux API 1 compatible Layer"
+ bool "Enable Video For Linux API 1 compatible Layer"
depends on VIDEO_DEV
default y
---help---