diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-31 18:49:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-31 18:49:17 -0300 |
| commit | a2e7924725fad07fe677f48146905993b80d934b (patch) | |
| tree | e086204745b240bab57bdf6b1bebc57fe0f70646 /linux/drivers | |
| parent | 210a50f4db4701102f795d84538134a3c9b30230 (diff) | |
| download | mediapointer-dvb-s2-a2e7924725fad07fe677f48146905993b80d934b.tar.gz mediapointer-dvb-s2-a2e7924725fad07fe677f48146905993b80d934b.tar.bz2 | |
Driver dsbr100 is a radio device, not a video one!
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/radio/Kconfig | 12 | ||||
| -rw-r--r-- | linux/drivers/media/radio/Makefile | 1 | ||||
| -rw-r--r-- | linux/drivers/media/radio/dsbr100.c (renamed from linux/drivers/media/video/dsbr100.c) | 0 | ||||
| -rw-r--r-- | linux/drivers/media/video/Kconfig | 12 | ||||
| -rw-r--r-- | linux/drivers/media/video/Makefile | 1 |
5 files changed, 13 insertions, 13 deletions
diff --git a/linux/drivers/media/radio/Kconfig b/linux/drivers/media/radio/Kconfig index 525c9b651..57b754ad3 100644 --- a/linux/drivers/media/radio/Kconfig +++ b/linux/drivers/media/radio/Kconfig @@ -350,5 +350,17 @@ config RADIO_ZOLTRIX_PORT help Enter the I/O port of your Zoltrix radio card. +config USB_DSBR + tristate "D-Link USB FM radio support (EXPERIMENTAL)" + depends on USB && VIDEO_V4L1 && EXPERIMENTAL + ---help--- + Say Y here if you want to connect this type of radio to your + computer's USB port. Note that the audio is not digital, and + you must connect the line out connector to a sound card or a + set of speakers. + + To compile this driver as a module, choose M here: the + module will be called dsbr100. + endmenu diff --git a/linux/drivers/media/radio/Makefile b/linux/drivers/media/radio/Makefile index e95b6805e..cf55a18e3 100644 --- a/linux/drivers/media/radio/Makefile +++ b/linux/drivers/media/radio/Makefile @@ -20,5 +20,6 @@ obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o obj-$(CONFIG_RADIO_GEMTEK_PCI) += radio-gemtek-pci.o obj-$(CONFIG_RADIO_TRUST) += radio-trust.o obj-$(CONFIG_RADIO_MAESTRO) += radio-maestro.o +obj-$(CONFIG_USB_DSBR) += dsbr100.o EXTRA_CFLAGS += -Isound diff --git a/linux/drivers/media/video/dsbr100.c b/linux/drivers/media/radio/dsbr100.c index 45d2b5028..45d2b5028 100644 --- a/linux/drivers/media/video/dsbr100.c +++ b/linux/drivers/media/radio/dsbr100.c diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index fe56862d5..732bf1e7c 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -449,18 +449,6 @@ source "drivers/media/video/pvrusb2/Kconfig" source "drivers/media/video/em28xx/Kconfig" -config USB_DSBR - tristate "D-Link USB FM radio support (EXPERIMENTAL)" - depends on USB && VIDEO_V4L1 && EXPERIMENTAL - ---help--- - Say Y here if you want to connect this type of radio to your - computer's USB port. Note that the audio is not digital, and - you must connect the line out connector to a sound card or a - set of speakers. - - To compile this driver as a module, choose M here: the - module will be called dsbr100. - source "drivers/media/video/usbvideo/Kconfig" source "drivers/media/video/et61x251/Kconfig" diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index 353d61cfa..010833d81 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -77,7 +77,6 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o obj-$(CONFIG_USB_DABUSB) += dabusb.o -obj-$(CONFIG_USB_DSBR) += dsbr100.o obj-$(CONFIG_USB_OV511) += ov511.o obj-$(CONFIG_USB_SE401) += se401.o obj-$(CONFIG_USB_STV680) += stv680.o |