X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmedia%2FKconfig;h=93ea201f426cad53997ee815c69c1679bbe70b39;hb=b3f5dbd0e1d4a1f9ed17cb40b9f789c606c44206;hp=7a7803b5d4976353b8a475a9eebf98a9e94da52a;hpb=2d4b3f37ded8998a362c8d0b4be02f583dd9a002;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 7a7803b5d49..93ea201f426 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -38,7 +38,6 @@ config VIDEO_ALLOW_V4L1
 	bool "Enable Video For Linux API 1 (DEPRECATED)"
 	depends on VIDEO_DEV && VIDEO_V4L2_COMMON
 	default VIDEO_DEV && VIDEO_V4L2_COMMON
-	select VIDEO_V4L1_COMPAT
 	---help---
 	  Enables drivers based on the legacy V4L1 API.
 
@@ -49,9 +48,9 @@ config VIDEO_ALLOW_V4L1
 	  If you are unsure as to whether this is required, answer Y.
 
 config VIDEO_V4L1_COMPAT
-	bool "Enable Video For Linux API 1 compatible Layer"
+	bool "Enable Video For Linux API 1 compatible Layer" if !VIDEO_ALLOW_V4L1
 	depends on VIDEO_DEV
-	default VIDEO_DEV
+	default y
 	---help---
 	  Enables a compatibility API used by most V4L2 devices to allow
 	  its usage with legacy applications that supports only V4L1 api.