lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
This reverts commit 1e70a6cf7e.

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>
This commit is contained in:
Mauro Carvalho Chehab
2012-06-25 11:05:15 -03:00
parent 7bcfdf0f70
commit 6d642d2606
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/radio/Kconfig
View File

@@ -193,8 +193,8 @@ config RADIO_CADET
config RADIO_LM7000 config RADIO_LM7000
tristate tristate
depends on RADIO_RTRACK || RADIO_SF16FMI depends on RADIO_RTRACK
default RADIO_RTRACK || RADIO_SF16FMI default RADIO_RTRACK
config RADIO_RTRACK config RADIO_RTRACK
tristate "AIMSlab RadioTrack (aka RadioReveal) support" tristate "AIMSlab RadioTrack (aka RadioReveal) support"
@@ -328,7 +328,6 @@ config RADIO_MIROPCM20
config RADIO_SF16FMI config RADIO_SF16FMI
tristate "SF16-FMI/SF16-FMP/SF16-FMD Radio" tristate "SF16-FMI/SF16-FMP/SF16-FMD Radio"
depends on ISA && VIDEO_V4L2 depends on ISA && VIDEO_V4L2
select RADIO_LM7000
---help--- ---help---
Choose Y here if you have one of these FM radio cards. Choose Y here if you have one of these FM radio cards.

2
drivers/media/radio/radio-sf16fmi.c
View File

@@ -27,8 +27,6 @@
#include <linux/io.h> /* outb, outb_p */ #include <linux/io.h> /* outb, outb_p */
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-ioctl.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_AUTHOR("Petr Vandrovec, vandrove@vc.cvut.cz and M. Kirkwood");
MODULE_DESCRIPTION("A driver for the SF16-FMI, SF16-FMP and SF16-FMD radio."); MODULE_DESCRIPTION("A driver for the SF16-FMI, SF16-FMP and SF16-FMD radio.");