diff --git a/[refs] b/[refs]
index 6f7ef4b2eb16..ba1bb72293de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2129af5b65e28dc3a10402603aa714e493b2169
+refs/heads/master: 3bd4065961aa03d030cd58feec03d60479fc4348
diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c
index fda0c1631dbd..5769db47529c 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-core.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-core.c
@@ -270,7 +270,7 @@ struct sram_channel cx23887_sram_channels[] = {
 		.name		= "TS2 C",
 		.cmds_start	= 0x10140,
 		.ctrl_start	= 0x10680,
-		.cdt		= 0x10480,
+		.cdt		= 0x108d0,
 		.fifo_start	= 0x6000,
 		.fifo_size	= 0x1000,
 		.ptr1_reg	= DMA5_PTR1,
@@ -1095,16 +1095,13 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
 	 */
 	switch(cx23885_boards[dev->board].bridge) {
 	case CX23885_BRIDGE_885:
+	case CX23885_BRIDGE_887:
 		/* enable irqs */
 		dprintk(1, "%s() enabling TS int's and DMA\n", __FUNCTION__ );
 		cx_set(port->reg_ts_int_msk,  port->ts_int_msk_val);
 		cx_set(port->reg_dma_ctl, port->dma_ctl_val);
 		cx_set(PCI_INT_MSK, dev->pci_irqmask | port->pci_irqmask);
 		break;
-	case CX23885_BRIDGE_887:
-		// FIXME
-		dprintk(1, "%s() NOT enabling TS int's and DMA, NMI bug\n", __FUNCTION__ );
-		break;
 	default:
 		// FIXME: generate a sensible switch-default message
 		printk(KERN_ERR "%s() error, default case", __FUNCTION__ );