V4L/DVB (8271): sms1xxx: usbvid table

[pandora-kernel.git] / drivers / media / mdtv / smsusb.c

diff --git a/drivers/media/mdtv/smsusb.c b/drivers/media/mdtv/smsusb.c
index 07c72f0..c0f77a3 100644 (file)
--- a/drivers/media/mdtv/smsusb.c
+++ b/drivers/media/mdtv/smsusb.c
@@ -26,11 +26,6 @@
 
 #include "smscoreapi.h"
 
-#define USB_VID_SIANO  0x187f
-#define USB_PID_0010   0x0010
-#define USB_PID_0100   0x0100
-#define USB_PID_0200   0x0200
-
 #define USB1_BUFFER_SIZE               0x1000
 #define USB2_BUFFER_SIZE               0x4000
 
@@ -58,14 +53,6 @@ typedef struct _smsusb_device
        int                             buffer_size;
 } *psmsusb_device_t;
 
-static struct usb_device_id smsusb_id_table [] = {
-       { USB_DEVICE(USB_VID_SIANO, USB_PID_0010) },
-       { USB_DEVICE(USB_VID_SIANO, USB_PID_0100) },
-       { USB_DEVICE(USB_VID_SIANO, USB_PID_0200) },
-       { }             /* Terminating entry */
-};
-MODULE_DEVICE_TABLE (usb, smsusb_id_table);
-
 int smsusb_submit_urb(smsusb_device_t* dev, smsusb_urb_t* surb);
 
 void smsusb_onresponse(struct urb *urb)
@@ -315,7 +302,7 @@ int smsusb_init_device(struct usb_interface *intf)
 
        switch (dev->udev->descriptor.idProduct)
        {
-               case USB_PID_0100:
+               case 0x100:
                        dev->buffer_size = USB1_BUFFER_SIZE;
 
                        params.setmode_handler = smsusb1_setmode;
@@ -414,6 +401,14 @@ void smsusb_disconnect(struct usb_interface *intf)
        smsusb_term_device(intf);
 }
 
+static struct usb_device_id smsusb_id_table [] = {
+       { USB_DEVICE(0x187F, 0x0010) },
+       { USB_DEVICE(0x187F, 0x0100) },
+       { USB_DEVICE(0x187F, 0x0200) },
+       { }             /* Terminating entry */
+};
+MODULE_DEVICE_TABLE (usb, smsusb_id_table);
+
 static struct usb_driver smsusb_driver = {
        .name                   = "smsusb",
        .probe                  = smsusb_probe,