Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / drivers / media / Kconfig

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 583d151..ed4aa4e 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -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"
@@ -82,9 +82,6 @@ config VIDEO_IR
 config VIDEO_TVEEPROM
        tristate
 
-config VIDEO_CX2341X
-       tristate
-
 config USB_DABUSB
        tristate "DABUSB driver"
        depends on USB