Commit 6d642d26 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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

This reverts commit 1e70a6cf.

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Cc: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7bcfdf0f

drivers/media/radio/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -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.

drivers/media/radio/radio-sf16fmi.c

+0 −2
Original line number Diff line number Diff line
@@ -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.");