---

yaml --- r: 320053 b: refs/heads/master c: 6d642d2 h: refs/heads/master i: 320051: c28b9f2 v: v3
git-mirror · Jun 25, 2012 · d9764c2 · d9764c2
1 parent b89be32
commit d9764c2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bcfdf0f703211cdc85ee240e44f8773246902d8
+refs/heads/master: 6d642d26065c5d375fbb819dbfd8f5d1b9255ece
diff --git a/trunk/drivers/media/radio/Kconfig b/trunk/drivers/media/radio/Kconfig
@@ -193,8 +193,8 @@ config RADIO_CADET
 
 config RADIO_LM7000
 	tristate
-	depends on RADIO_RTRACK || RADIO_SF16FMI
-	default RADIO_RTRACK || RADIO_SF16FMI
+	depends on RADIO_RTRACK
+	default RADIO_RTRACK
 
 config RADIO_RTRACK
 	tristate "AIMSlab RadioTrack (aka RadioReveal) support"
@@ -328,7 +328,6 @@ config RADIO_MIROPCM20
 config RADIO_SF16FMI
 	tristate "SF16-FMI/SF16-FMP/SF16-FMD Radio"
 	depends on ISA && VIDEO_V4L2
-	select RADIO_LM7000
 	---help---
 	  Choose Y here if you have one of these FM radio cards.
 

diff --git a/trunk/drivers/media/radio/radio-sf16fmi.c b/trunk/drivers/media/radio/radio-sf16fmi.c
@@ -27,8 +27,6 @@
 #include <linux/io.h>		/* outb, outb_p			*/
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
-#include <media/v4l2-ctrls.h>
-#include "lm7000.h"
 
 MODULE_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood");
 MODULE_DESCRIPTION("A driver for the SF16-FMI, SF16-FMP and SF16-FMD radio.");