V4L/DVB (4679): Fix for NULL pointer dereference oops during boot.

[linux-2.6-omap-h63xx.git] / drivers / media / Kconfig

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 344d83aae3ec3b5d6d7b4e9e41dee2f47d59e79f..ed4aa4e7912c39fd3ed764eab623e64490735073 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
-       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---
@@ -53,7 +53,7 @@ config VIDEO_V4L1_COMPAT
          If you are unsure as to whether this is required, answer Y.
 
 config VIDEO_V4L2
-       tristate
+       bool
        default y
 
 source "drivers/media/video/Kconfig"