--- dib0700_devices.c.orig	2008-09-13 12:03:46.000000000 +0200
+++ dib0700_devices.c	2008-09-14 09:01:38.000000000 +0200
@@ -677,6 +677,42 @@
 	{ 0x01, 0x7d, KEY_VOLUMEDOWN },
 	{ 0x02, 0x42, KEY_CHANNELUP },
 	{ 0x00, 0x7d, KEY_CHANNELDOWN },
+
+	/* Key codes for the Elgato EyeTV Diversity, set dvb_usb_dib0700_ir_proto=0 */
+  	{ 0x45, 0x01, KEY_POWER },
+  	{ 0x45, 0x02, KEY_MUTE },
+	{ 0x45, 0x0d, KEY_0 },
+	{ 0x45, 0x03, KEY_1 },
+	{ 0x45, 0x04, KEY_2 },
+	{ 0x45, 0x05, KEY_3 },
+	{ 0x45, 0x06, KEY_4 },
+	{ 0x45, 0x07, KEY_5 },
+	{ 0x45, 0x08, KEY_6 },
+	{ 0x45, 0x09, KEY_7 },
+	{ 0x45, 0x0a, KEY_8 },
+	{ 0x45, 0x0b, KEY_9 },
+	{ 0x45, 0x0c, KEY_LAST },
+	{ 0x45, 0x0e, KEY_ENTER },
+  	{ 0x45, 0x0f, KEY_RED },
+	{ 0x45, 0x11, KEY_GREEN },
+	{ 0x45, 0x15, KEY_YELLOW },
+	{ 0x45, 0x17, KEY_BLUE },
+	{ 0x45, 0x14, KEY_VOLUMEUP },
+	{ 0x45, 0x12, KEY_VOLUMEDOWN },
+	{ 0x45, 0x10, KEY_CHANNELUP },
+	{ 0x45, 0x16, KEY_CHANNELDOWN },
+	{ 0x45, 0x13, KEY_OK },
+	//	{ 0x45, 0x18, KEY_ARROW2 }, // Below KEY_YELLOW
+  	{ 0x45, 0x19, KEY_PLAYPAUSE },
+	//	{ 0x45, 0x1a, KEY_ARROW3 }, // Below KEY_BLUE
+  	{ 0x45, 0x1b, KEY_REWIND },
+	{ 0x45, 0x1c, KEY_L }, /* Live */
+  	{ 0x45, 0x1d, KEY_FASTFORWARD },
+	{ 0x45, 0x1e, KEY_STOP },
+	{ 0x45, 0x1f, KEY_TEXT },
+	{ 0x45, 0x40, KEY_RECORD },
+	//	{ 0x45, 0x41, KEY_HOLD }, // Below KEY_STOP
+	{ 0x45, 0x42, KEY_SELECT },
 };
 
 /* STK7700P: Hauppauge Nova-T Stick, AVerMedia Volar */
@@ -1119,6 +1155,7 @@
 	{ USB_DEVICE(USB_VID_LEADTEK,   USB_PID_WINFAST_DTV_DONGLE_STK7700P_2) },
 /* 35 */{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK_52009) },
 	{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_3) },
+	{ USB_DEVICE(USB_VID_ELGATO,    USB_PID_ELGATO_EYETV_DIVERSITY) },
 	{ 0 }		/* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -1395,6 +1432,39 @@
 		}
 	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
 
+		.num_adapters = 2,
+		.adapter = {
+			{
+				.frontend_attach  = stk7070pd_frontend_attach0,
+				.tuner_attach     = dib7070p_tuner_attach,
+
+				DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+
+				.size_of_priv     = sizeof(struct dib0700_adapter_state),
+			}, {
+				.frontend_attach  = stk7070pd_frontend_attach1,
+				.tuner_attach     = dib7070p_tuner_attach,
+
+				DIB0700_DEFAULT_STREAMING_CONFIG(0x03),
+
+				.size_of_priv     = sizeof(struct dib0700_adapter_state),
+			}
+		},
+
+	     	.num_device_descs = 1,
+		.devices = {
+			{   "Elgato EyeTV Diversity",
+				{ &dib0700_usb_id_table[37], NULL },
+				{ NULL }
+			}
+		},
+		.rc_interval      = DEFAULT_RC_INTERVAL,
+		.rc_key_map       = dib0700_rc_keys,
+		.rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),
+		.rc_query         = dib0700_rc_query
+
+	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
+
 		.num_adapters = 1,
 		.adapter = {
 			{