---

yaml --- r: 242144 b: refs/heads/master c: 3e507c5 h: refs/heads/master v: v3
git-mirror · Mar 22, 2011 · f23e95d · f23e95d
1 parent d74a1a9
commit f23e95d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b50b3a1acd22a07e354a154e5d00a9d338446b77
+refs/heads/master: 3e507c55918b51fed30ae5e9a3667c6a5f2e8755
diff --git a/trunk/drivers/media/video/saa7134/Kconfig b/trunk/drivers/media/video/saa7134/Kconfig
@@ -28,6 +28,7 @@ config VIDEO_SAA7134_RC
 	bool "Philips SAA7134 Remote Controller support"
 	depends on RC_CORE
 	depends on VIDEO_SAA7134
+	depends on !(RC_CORE=m && VIDEO_SAA7134=y)
 	default y
 	---help---
 	  Enables Remote Controller support on saa7134 driver.