aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-10-03 17:12:14 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:35:25 -0200
commit6f7880f0264457e80e456b512722c7a627883fda (patch)
treea01b52d49cd453c1a859181572ed693dbe0d1803 /drivers/media
parentf0c3a2ca56c5c56ecfaf46c1b47851319e9655ac (diff)
downloadkernel_samsung_smdk4412-6f7880f0264457e80e456b512722c7a627883fda.zip
kernel_samsung_smdk4412-6f7880f0264457e80e456b512722c7a627883fda.tar.gz
kernel_samsung_smdk4412-6f7880f0264457e80e456b512722c7a627883fda.tar.bz2
V4L/DVB (5223): Rename USB_PID_MSI_MEGASKY55801 to USB_PID_MSI_MEGASKY580_55801
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h2
-rw-r--r--drivers/media/dvb/dvb-usb/gl861.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 0414ee3..c3a42c1 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -121,7 +121,7 @@
#define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM 0xdb55
#define USB_PID_MEDION_MD95700 0x0932
#define USB_PID_MSI_MEGASKY580 0x5580
-#define USB_PID_MSI_MEGASKY55801 0x5581
+#define USB_PID_MSI_MEGASKY580_55801 0x5581
#define USB_PID_KYE_DVB_T_COLD 0x701e
#define USB_PID_KYE_DVB_T_WARM 0x701f
#define USB_PID_PCTV_200E 0x020e
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c
index c16daf1..7562cc4 100644
--- a/drivers/media/dvb/dvb-usb/gl861.c
+++ b/drivers/media/dvb/dvb-usb/gl861.c
@@ -157,7 +157,7 @@ static int gl861_probe(struct usb_interface *intf,
}
static struct usb_device_id gl861_table [] = {
- { USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY55801) },
+ { USB_DEVICE(USB_VID_MSI, USB_PID_MSI_MEGASKY580_55801) },
{} /* Terminating entry */
};
MODULE_DEVICE_TABLE (usb, gl861_table);