diff options
author | Mark Lord <mlord@pobox.com> | 2008-12-03 13:26:15 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 14:13:56 -0500 |
commit | 5e6de7d9a1a373414a41a7441100f90b71c6119f (patch) | |
tree | dd84f2b24be31c9b10dee6bce578e52bb09cba2f | |
parent | 6a2d802ca01bd83b860145e7497a7a049c354cd7 (diff) |
V4L/DVB (10157): Add USB ID for the Sil4701 radio from DealExtreme
Signed-off-by: Mark Lord <mlord@pobox.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
[tobias.lorenz@gmx.net: Code beautifications and documentation added]
Signed-off-by: Tobias Lorenz <tobias.lorenz@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | Documentation/video4linux/si470x.txt | 1 | ||||
-rw-r--r-- | drivers/media/radio/radio-si470x.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/video4linux/si470x.txt b/Documentation/video4linux/si470x.txt index 11c5fd22a332..49679e6aaa76 100644 --- a/Documentation/video4linux/si470x.txt +++ b/Documentation/video4linux/si470x.txt | |||
@@ -41,6 +41,7 @@ chips are known to work: | |||
41 | - 10c4:818a: Silicon Labs USB FM Radio Reference Design | 41 | - 10c4:818a: Silicon Labs USB FM Radio Reference Design |
42 | - 06e1:a155: ADS/Tech FM Radio Receiver (formerly Instant FM Music) (RDX-155-EF) | 42 | - 06e1:a155: ADS/Tech FM Radio Receiver (formerly Instant FM Music) (RDX-155-EF) |
43 | - 1b80:d700: KWorld USB FM Radio SnapMusic Mobile 700 (FM700) | 43 | - 1b80:d700: KWorld USB FM Radio SnapMusic Mobile 700 (FM700) |
44 | - 10c5:819a: DealExtreme USB Radio | ||
44 | 45 | ||
45 | 46 | ||
46 | Software | 47 | Software |
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c index 457445ec7b52..67cbce82cb91 100644 --- a/drivers/media/radio/radio-si470x.c +++ b/drivers/media/radio/radio-si470x.c | |||
@@ -96,6 +96,8 @@ | |||
96 | * 2008-10-20 Alexey Klimov <klimov.linux@gmail.com> | 96 | * 2008-10-20 Alexey Klimov <klimov.linux@gmail.com> |
97 | * - add support for KWorld USB FM Radio FM700 | 97 | * - add support for KWorld USB FM Radio FM700 |
98 | * - blacklisted KWorld radio in hid-core.c and hid-ids.h | 98 | * - blacklisted KWorld radio in hid-core.c and hid-ids.h |
99 | * 2008-12-03 Mark Lord <mlord@pobox.com> | ||
100 | * - add support for DealExtreme USB Radio | ||
99 | * | 101 | * |
100 | * ToDo: | 102 | * ToDo: |
101 | * - add firmware download/update support | 103 | * - add firmware download/update support |
@@ -138,6 +140,8 @@ static struct usb_device_id si470x_usb_driver_id_table[] = { | |||
138 | { USB_DEVICE_AND_INTERFACE_INFO(0x06e1, 0xa155, USB_CLASS_HID, 0, 0) }, | 140 | { USB_DEVICE_AND_INTERFACE_INFO(0x06e1, 0xa155, USB_CLASS_HID, 0, 0) }, |
139 | /* KWorld USB FM Radio SnapMusic Mobile 700 (FM700) */ | 141 | /* KWorld USB FM Radio SnapMusic Mobile 700 (FM700) */ |
140 | { USB_DEVICE_AND_INTERFACE_INFO(0x1b80, 0xd700, USB_CLASS_HID, 0, 0) }, | 142 | { USB_DEVICE_AND_INTERFACE_INFO(0x1b80, 0xd700, USB_CLASS_HID, 0, 0) }, |
143 | /* DealExtreme USB Radio */ | ||
144 | { USB_DEVICE_AND_INTERFACE_INFO(0x10c5, 0x819a, USB_CLASS_HID, 0, 0) }, | ||
141 | /* Terminating entry */ | 145 | /* Terminating entry */ |
142 | { } | 146 | { } |
143 | }; | 147 | }; |