summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-31 00:34:49 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-31 00:34:49 -0200
commit03d6e87fd6d1fdb6e7a1b638409d2f6f98df061d (patch)
tree572cb51565c0b28706029fd508afb0ae526a421a
parent03ce7280ba34fec261331d18e5bb61bb467bf1e9 (diff)
parentbda2ee9b43936b9a74544ce71e9b398f42ef2572 (diff)
downloadmediapointer-dvb-s2-03d6e87fd6d1fdb6e7a1b638409d2f6f98df061d.tar.gz
mediapointer-dvb-s2-03d6e87fd6d1fdb6e7a1b638409d2f6f98df061d.tar.bz2
merge: http://linuxtv.org/hg/~tlorenz/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--linux/Documentation/video4linux/si470x.txt1
-rw-r--r--linux/drivers/media/radio/radio-si470x.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/linux/Documentation/video4linux/si470x.txt b/linux/Documentation/video4linux/si470x.txt
index 11c5fd22a..49679e6aa 100644
--- a/linux/Documentation/video4linux/si470x.txt
+++ b/linux/Documentation/video4linux/si470x.txt
@@ -41,6 +41,7 @@ chips are known to work:
- 10c4:818a: Silicon Labs USB FM Radio Reference Design
- 06e1:a155: ADS/Tech FM Radio Receiver (formerly Instant FM Music) (RDX-155-EF)
- 1b80:d700: KWorld USB FM Radio SnapMusic Mobile 700 (FM700)
+- 10c5:819a: DealExtreme USB Radio
Software
diff --git a/linux/drivers/media/radio/radio-si470x.c b/linux/drivers/media/radio/radio-si470x.c
index 82c115c18..f3cdf3af4 100644
--- a/linux/drivers/media/radio/radio-si470x.c
+++ b/linux/drivers/media/radio/radio-si470x.c
@@ -96,6 +96,8 @@
* 2008-10-20 Alexey Klimov <klimov.linux@gmail.com>
* - add support for KWorld USB FM Radio FM700
* - blacklisted KWorld radio in hid-core.c and hid-ids.h
+ * 2008-12-03 Mark Lord <mlord@pobox.com>
+ * - add support for DealExtreme USB Radio
*
* ToDo:
* - add firmware download/update support
@@ -139,6 +141,8 @@ static struct usb_device_id si470x_usb_driver_id_table[] = {
{ USB_DEVICE_AND_INTERFACE_INFO(0x06e1, 0xa155, USB_CLASS_HID, 0, 0) },
/* KWorld USB FM Radio SnapMusic Mobile 700 (FM700) */
{ USB_DEVICE_AND_INTERFACE_INFO(0x1b80, 0xd700, USB_CLASS_HID, 0, 0) },
+ /* DealExtreme USB Radio */
+ { USB_DEVICE_AND_INTERFACE_INFO(0x10c5, 0x819a, USB_CLASS_HID, 0, 0) },
/* Terminating entry */
{ }
};