Skip to content

Commit

Permalink
Revert "[media] radio-sf16fmi: Use LM7000 driver"
Browse files Browse the repository at this point in the history
This reverts commit 1e70a6c.

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>
  • Loading branch information
Mauro Carvalho Chehab committed Jun 25, 2012
1 parent 7bcfdf0 commit 6d642d2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 2 additions & 3 deletions drivers/media/radio/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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.

Expand Down
2 changes: 0 additions & 2 deletions drivers/media/radio/radio-sf16fmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand Down

0 comments on commit 6d642d2

Please sign in to comment.