Revert "[media] radio-sf16fmi: Use LM7000 driver"

This reverts commit 1e70a6cf7e965bafd89bf363772eb1a4b8e35934.

As requested by Hans Verkuil:
> You accidentally merged the wrong first version of the lm7000 patch series.
>
> These are the correct second version patches:
>
> http://patchwork.linuxtv.org/patch/11689/
> http://patchwork.linuxtv.org/patch/11690/
> http://patchwork.linuxtv.org/patch/11691/
>
> The second version is much simpler and doesn't require the creation of a whole
> new driver.

Requested-by: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 2 insertions, 5 deletions

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index f4c392481b3c..abdf43c05720 100644
--- a/drivers/media/radio/Kconfig
+++ b/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/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index ddd922dd8adb..a81d723b8c77 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/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.");