From 308f6091e263395b7f9ba179f16a14869977afc7 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Mon, 7 Feb 2011 09:41:47 +0200
Subject: [PATCH] --- yaml --- r: 235872 b: refs/heads/master c:
 66681fb74e3d2f4dbf40f1e22b315a3807408eaf h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/staging/easycap/Kconfig | 21 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ba112fffbf5d..6b6a27bc2b60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d936435f2082788748ae5783cf2c006367d04bb8
+refs/heads/master: 66681fb74e3d2f4dbf40f1e22b315a3807408eaf
diff --git a/trunk/drivers/staging/easycap/Kconfig b/trunk/drivers/staging/easycap/Kconfig
index 5072cf8a5da0..6ed208c61855 100644
--- a/trunk/drivers/staging/easycap/Kconfig
+++ b/trunk/drivers/staging/easycap/Kconfig
@@ -1,6 +1,6 @@
 config EASYCAP
 	tristate "EasyCAP USB ID 05e1:0408 support"
-	depends on USB && VIDEO_DEV && SOUND
+	depends on USB && VIDEO_DEV && (SND || SOUND_OSS_CORE)
 
 	---help---
 	  This is an integrated audio/video driver for EasyCAP cards with
@@ -15,9 +15,25 @@ config EASYCAP
 	  To compile this driver as a module, choose M here: the
 	  module will be called easycap
 
+choice
+        prompt "Sound Interface"
+        depends on EASYCAP
+        default EASYCAP_SND
+	---help---
+
+config EASYCAP_SND
+        bool "ALSA"
+	depends on SND
+	select SND_PCM
+
+        ---help---
+          Say 'Y' if you want to use ALSA interface
+
+	  This will disable Open Sound System (OSS) binding.
+
 config EASYCAP_OSS
 	bool "OSS (DEPRECATED)"
-	depends on EASYCAP && SOUND_OSS_CORE
+	depends on SOUND_OSS_CORE
 
 	---help---
 	  Say 'Y' if you prefer Open Sound System (OSS) interface
@@ -26,6 +42,7 @@ config EASYCAP_OSS
 
 	  Once binding to ALSA interface will be stable this option will be
           removed.
+endchoice
 
 config EASYCAP_DEBUG
 	bool "Enable EasyCAP driver debugging"