diff -Naru lirc_mod_mce.orig/lirc_mod_mce.c lirc_mod_mce/lirc_mod_mce.c
--- lirc_mod_mce.orig/lirc_mod_mce.c	2008-04-18 02:12:28.000000000 +0930
+++ lirc_mod_mce/lirc_mod_mce.c	2009-05-28 07:53:10.000000000 +0930
@@ -171,17 +171,76 @@
 #define VENDOR_TATUNG           0x1460
 #define VENDOR_GATEWAY          0x107b
 #define VENDOR_SHUTTLE          0x1308
+#define VENDOR_PHILIPS          0x0471
+#define VENDOR_SMK              0x0609
+#define VENDOR_TATUNG           0x1460
+#define VENDOR_GATEWAY          0x107b
+#define VENDOR_SHUTTLE          0x1308
+#define VENDOR_SHUTTLE2         0x051c
+#define VENDOR_MITSUMI          0x03ee
+#define VENDOR_TOPSEED          0x1784
+#define VENDOR_RICAVISION       0x179d
+#define VENDOR_ITRON            0x195d
+#define VENDOR_FIC              0x1509
+#define VENDOR_LG               0x043e
+#define VENDOR_MICROSOFT        0x045e
+#define VENDOR_FORMOSA          0x147a
+#define VENDOR_FINTEK           0x1934
 #define VENDOR_PINNACLE         0x2304
 
-
 static struct usb_device_id usb_remote_table [] = {
-    { USB_DEVICE(VENDOR_PHILIPS, 0x0815) },  /* Philips eHome Infrared Transciever */
-    { USB_DEVICE(VENDOR_SMK, 0x031d) },      /* SMK/Toshiba G83C0004D410 */
-    { USB_DEVICE(VENDOR_TATUNG, 0x9150) },   /* Tatung eHome Infrared Transceiver */
-    { USB_DEVICE(VENDOR_SHUTTLE, 0xc001) },  /* Shuttle eHome Infrared Transceiver */
-    { USB_DEVICE(VENDOR_GATEWAY, 0x3009) },  /* Gateway eHome Infrared Transceiver */
-    { USB_DEVICE(VENDOR_PINNACLE, 0x0225) }, /* Pinnacle Remote USB RC6 */
-    { }                                      /* Terminating entry */
+    /* Philips eHome Infrared Transciever */
+    { USB_DEVICE(VENDOR_PHILIPS, 0x0815) },
+    /* Philips Infrared Transciever - HP branded */
+    { USB_DEVICE(VENDOR_PHILIPS, 0x060c) },
+    /* Philips SRM5100 */
+    { USB_DEVICE(VENDOR_PHILIPS, 0x060d) },
+    /* SMK/Toshiba G83C0004D410 */
+    { USB_DEVICE(VENDOR_SMK, 0x031d) },
+    /* SMK eHome Infrared Transceiver (Sony VAIO) */
+    { USB_DEVICE(VENDOR_SMK, 0x0322) },
+    /* bundled with Hauppauge PVR-150 */
+    { USB_DEVICE(VENDOR_SMK, 0x0334) },
+    /* Tatung eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_TATUNG, 0x9150) },
+    /* Shuttle eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_SHUTTLE, 0xc001) },
+    /* Shuttle eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_SHUTTLE2, 0xc001) },
+    /* Gateway eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_GATEWAY, 0x3009) },
+    /* Mitsumi */
+    { USB_DEVICE(VENDOR_MITSUMI, 0x2501) },
+    /* Topseed eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_TOPSEED, 0x0001) },
+    /* Topseed HP eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_TOPSEED, 0x0006) },
+    /* Topseed eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_TOPSEED, 0x0007) },
+    /* Topseed eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_TOPSEED, 0x0008) },
+    /* Ricavision internal Infrared Transceiver */
+    { USB_DEVICE(VENDOR_RICAVISION, 0x0010) },
+    /* Itron ione Libra Q-11 */
+    { USB_DEVICE(VENDOR_ITRON, 0x7002) },
+    /* FIC eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_FIC, 0x9242) },
+    /* LG eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_LG, 0x9803) },
+    /* Microsoft MCE Infrared Transceiver */
+    { USB_DEVICE(VENDOR_MICROSOFT, 0x00a0) },
+    /* Formosa eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_FORMOSA, 0xe015) },
+    /* Formosa aim / Trust MCE Infrared Receiver */
+    { USB_DEVICE(VENDOR_FORMOSA, 0xe017) },
+    /* Formosa Industrial Computing / Beanbag Emulation Device */
+    { USB_DEVICE(VENDOR_FORMOSA, 0xe018) },
+    /* Fintek eHome Infrared Transceiver */
+    { USB_DEVICE(VENDOR_FINTEK, 0x0602) },
+    /* Pinnacle Remote USB RC6 */
+    { USB_DEVICE(VENDOR_PINNACLE, 0x0225) },
+    /* Terminating entry */
+    { }
 };
 
 static unsigned char usb_kbd_keycode[256] = {
@@ -1108,7 +1167,7 @@
     input_dev->name = ir->name;
     input_dev->phys = ir->phys;
     usb_to_input_id(dev, &input_dev->id);
-    input_dev->cdev.dev = &dev->dev;
+    input_dev->dev.parent = &dev->dev;
     input_dev->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY);
     input_dev->evbit[BIT_WORD(EV_REL)] |= BIT_MASK(EV_REL);
     input_dev->relbit[BIT_WORD(REL_X)] |= BIT_MASK(REL_X);